summaryrefslogtreecommitdiff
path: root/Documentation/howto/revert-a-faulty-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-06-16 14:27:06 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-06-16 14:27:07 -0700
commit0d5d7db43553d26fdcd18948fbc6a53cd97c579f (patch)
tree2cc5e477fbf30a5029834889f484f95d376f475a /Documentation/howto/revert-a-faulty-merge.txt
parentMerge branch 'jk/die-on-bogus-worktree-late' (diff)
parentMakefile: silence perl/PM.stamp recipe (diff)
downloadtgif-0d5d7db43553d26fdcd18948fbc6a53cd97c579f.tar.xz
Merge branch 'jk/make-fix-dependencies'
Build clean-up. * jk/make-fix-dependencies: Makefile: silence perl/PM.stamp recipe Makefile: avoid timestamp updates to GIT-BUILD-OPTIONS Makefile: drop dependency between git-instaweb and gitweb
Diffstat (limited to 'Documentation/howto/revert-a-faulty-merge.txt')
0 files changed, 0 insertions, 0 deletions