diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2007-03-12 13:26:59 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-03-12 13:26:59 -0400 |
| commit | 2ec0cb7959b0bf965d54f95453f5b4b34e8d3100 (patch) | |
| tree | 56e3e7313ce204a3cef274c81e8f125f9b03669e /git-merge-octopus.sh | |
| parent | git-gui: Support of "make -s" in: do not output anything of the build itself (diff) | |
| parent | git-gui: Allow 'git gui version' outside of a repository (diff) | |
| download | tgif-2ec0cb7959b0bf965d54f95453f5b4b34e8d3100.tar.xz | |
Merge branch 'maint'
* maint:
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-octopus.sh')
0 files changed, 0 insertions, 0 deletions