diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-10-09 09:33:23 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-09 09:33:23 -0700 |
| commit | 44c33a5b9603fba7c9556512a72e4e392ba4ae2d (patch) | |
| tree | 2163f6f2967ac3f6cc222b64ab8d1ea242b0fda6 /builtin-merge.c | |
| parent | builtin-apply: fix typo leading to stack corruption (diff) | |
| parent | rebase -i: remove leftover debugging (diff) | |
| download | git-44c33a5b9603fba7c9556512a72e4e392ba4ae2d.tar.gz git-44c33a5b9603fba7c9556512a72e4e392ba4ae2d.zip | |
Merge branch 'sg/maint-intrebase-msghook' into maint
* sg/maint-intrebase-msghook:
rebase -i: remove leftover debugging
rebase -i: proper prepare-commit-msg hook argument when squashing
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions