diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-04-20 08:01:51 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-20 08:01:51 +0200 |
| commit | 41a3e3aa9bdaede9ab7afed206428c1b071060d2 (patch) | |
| tree | 5c446d5c13797b117a34c309019e0131880fb1b1 /shell.c | |
| parent | gitweb: Fix 'history' view for deleted files with history (diff) | |
| parent | rebase: do not munge commit log message (diff) | |
| download | git-41a3e3aa9bdaede9ab7afed206428c1b071060d2.tar.xz git-41a3e3aa9bdaede9ab7afed206428c1b071060d2.zip | |
Merge branch 'jc/maint-rebase-am' into maint
* jc/maint-rebase-am:
rebase: do not munge commit log message
Conflicts:
git-am.sh
Diffstat (limited to 'shell.c')
0 files changed, 0 insertions, 0 deletions