1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-31 14:27:54 +01:00
git/git-gui
Shawn O. Pearce 5f5dbd719d Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui:
  git-gui: Use vi-like keys in merge dialog
  git-gui: Include commit id/subject in merge choices
  git-gui: Show all possible branches for merge
  git-gui: Move merge support into a namespace
  git-gui: Allow vi keys to scroll the diff/blame regions
  git-gui: Move console procs into their own namespace
  git-gui: Refactor into multiple files to save my sanity
  git-gui: Track our own embedded values and rebuild when they change
  git-gui: Refactor to use our git proc more often
  git-gui: Use option database defaults to set the font
  git-gui: Cleanup common font handling for font_ui
  git-gui: Correct line wrapping for too many branch message
  git-gui: Warn users before making an octopus merge
  git-gui: Include the subject in the status bar after commit

Also perform an evil merge change to update Git's main Makefile to
pass the proper options down into git-gui now that it depends on
reasonable values for 'sharedir' and 'TCL_PATH'.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2007-05-07 23:51:00 -04:00
..
lib Merge branch 'master' of git://repo.or.cz/git-gui 2007-05-07 23:51:00 -04:00
.gitignore Merge branch 'master' of git://repo.or.cz/git-gui 2007-05-07 23:51:00 -04:00
git-gui.sh Merge branch 'master' of git://repo.or.cz/git-gui 2007-05-07 23:51:00 -04:00
GIT-VERSION-GEN Merge branch 'master' of git://repo.or.cz/git-gui into maint 2007-02-21 11:09:57 -08:00
Makefile Merge branch 'master' of git://repo.or.cz/git-gui 2007-05-07 23:51:00 -04:00