diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-05-07 14:46:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-07 14:46:48 -0700 |
| commit | 679c7c56ed9f73db5892fe17ef9b67b84b0ca242 (patch) | |
| tree | 971c66f5b641bb5f2aeca09acb5ad48afc9064fb /builtin-merge-file.c | |
| parent | Added a reference to git-add in the documentation for git-update-index (diff) | |
| parent | Merge branch 'maint' of git://repo.or.cz/git-gui into maint (diff) | |
| download | tgif-679c7c56ed9f73db5892fe17ef9b67b84b0ca242.tar.xz | |
Merge branch 'maint'
* maint:
Documentation: don't reference non-existent 'git-cvsapplycommit'
user-manual: stop deprecating the manual
user-manual: miscellaneous editing
user-manual: fix .gitconfig editing examples
user-manual: clean up fast-forward and dangling-objects sections
user-manual: add section ID's
user-manual: more discussion of detached heads, fix typos
git-gui: Allow spaces in path to 'wish'
gitk: Allow user to choose whether to see the diff, old file, or new file
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions