diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-03-06 00:39:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-06 00:39:52 -0800 |
| commit | eec102524fda2df7d2846e865805ca213119bf10 (patch) | |
| tree | e60b88fc33ec9f10f175e7f6a55197fefbd103f2 /builtin-merge-file.c | |
| parent | git-commit: cd to top before showing the final stat (diff) | |
| parent | git-gui: Make 'make' quieter by default (diff) | |
| download | tgif-eec102524fda2df7d2846e865805ca213119bf10.tar.xz | |
Merge branch 'master' of git://repo.or.cz/git-gui into maint
* 'master' of git://repo.or.cz/git-gui:
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 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions