diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-12 18:43:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-12 18:43:22 (GMT) |
| commit | 3ed02de2f46105cbc45fcc8f3287513f470eb4a3 (patch) | |
| tree | 92c64fbd9e0a927c8529e6a169e263a675fa621e /git-merge.sh | |
| parent | fc095242b16d57bad1bfe089f919b9d6e6deda1b (diff) | |
| parent | 756d846fea4ac4b3bf0a0aea9fbf721138cf34cc (diff) | |
| download | git-3ed02de2f46105cbc45fcc8f3287513f470eb4a3.zip git-3ed02de2f46105cbc45fcc8f3287513f470eb4a3.tar.gz git-3ed02de2f46105cbc45fcc8f3287513f470eb4a3.tar.bz2 | |
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
* 'maint' of git://repo.or.cz/git-gui:
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 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions