diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-03-12 23:13:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-12 23:13:01 -0700 |
| commit | 9550a9cea9ee7a1f88c362a36a8ba0b4d7e205f4 (patch) | |
| tree | a1139d87abbf7d1ac72f7b68378b849dea890b33 /Documentation/git-resolve.txt | |
| parent | Merge branch 'master' of git://repo.or.cz/git/fastimport (diff) | |
| parent | Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint (diff) | |
| download | tgif-9550a9cea9ee7a1f88c362a36a8ba0b4d7e205f4.tar.xz | |
Merge branch 'maint'
* maint:
Don't package the git-gui credits file anymore
git-gui: Allow 'git gui version' outside of a repository
git-gui: Revert "git-gui: Display all authors of git-gui."
git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed."
git-gui: Allow committing empty merges
Diffstat (limited to 'Documentation/git-resolve.txt')
0 files changed, 0 insertions, 0 deletions