summaryrefslogtreecommitdiff
path: root/resolve-undo.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-06-18 11:16:56 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-18 11:16:56 -0700
commit8b8063cef3933c25288f2ab78d2adf1a4a2149ce (patch)
tree48358f8e4080985c8ef4de2ac345b0ab400b3952 /resolve-undo.h
parentMerge branch 'jn/rebase-cmdline-fix' (diff)
parentgit am: Remove stray error message from sed (diff)
downloadtgif-8b8063cef3933c25288f2ab78d2adf1a4a2149ce.tar.xz
Merge branch 'rr/am-help'
* rr/am-help: git am: Remove stray error message from sed git am: Display some help text when patch is empty git am: Set cmdline globally
Diffstat (limited to 'resolve-undo.h')
0 files changed, 0 insertions, 0 deletions