summaryrefslogtreecommitdiff
path: root/builtin/config.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-07-01 12:41:48 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-01 12:41:48 -0700
commit4b9a0deddcc643e5082739e7649ab745faf9e7fc (patch)
treeac9a40608c64d557781b130b52b786d21dadb61d /builtin/config.c
parentMerge branch 'rr/column-doc' (diff)
parentam: replace uses of --resolved with --continue (diff)
downloadtgif-4b9a0deddcc643e5082739e7649ab745faf9e7fc.tar.xz
Merge branch 'kb/am-deprecate-resolved'
Promote "git am --continue" over "git am --resolved" for UI consistency. * kb/am-deprecate-resolved: am: replace uses of --resolved with --continue
Diffstat (limited to 'builtin/config.c')
0 files changed, 0 insertions, 0 deletions