summaryrefslogtreecommitdiff
path: root/Documentation/howto/revert-a-faulty-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-10-31 13:15:23 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-31 13:15:23 -0700
commitb8171981fdea62f1f4c44f6d26f65b6324b31263 (patch)
tree8ec7ed5b0d4840cb343c1b79d48d3f47adaa7afb /Documentation/howto/revert-a-faulty-merge.txt
parentMerge branch 'aw/numbered-stash' (diff)
parentgit-compat-util: move content inside ifdef/endif guards (diff)
downloadtgif-b8171981fdea62f1f4c44f6d26f65b6324b31263.tar.xz
Merge branch 'jk/common-main'
A trivial clean-up to a recently graduated topic. * jk/common-main: git-compat-util: move content inside ifdef/endif guards
Diffstat (limited to 'Documentation/howto/revert-a-faulty-merge.txt')
0 files changed, 0 insertions, 0 deletions