diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-03-06 00:45:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-06 00:45:34 -0800 |
| commit | ba66c58637734a7a70196515a43328c2e92016c8 (patch) | |
| tree | b58806d5462aa67eaeafc05cd8df941093913ae3 /git-merge-one-file.sh | |
| parent | git-bundle: fix pack generation. (diff) | |
| parent | Merge branch 'master' of git://repo.or.cz/git-gui into maint (diff) | |
| download | tgif-ba66c58637734a7a70196515a43328c2e92016c8.tar.xz | |
Merge branch 'maint'
* maint:
git-gui: Make 'make' quieter by default
git-gui: Remove unnecessary /dev/null redirection.
git-gui: Don't create empty (same tree as parent) commits.
git-gui: Add Reset to the Branch menu.
git-gui: Relocate the menu/transport menu code.
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions