summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-06-27 14:38:17 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-27 14:38:17 -0700
commit6be17ec5828386c3ae17af26fac66f65f1c817ec (patch)
treed6884be47d1ff7122f1a471b2333b7d22e091580 /Documentation/merge-config.txt
parentMerge branch 'fc/show-branch-in-rebase-am' into maint (diff)
parentpush: make push.default = current use resolved HEAD (diff)
downloadtgif-6be17ec5828386c3ae17af26fac66f65f1c817ec.tar.xz
Merge branch 'rr/push-head' into maint
* rr/push-head: push: make push.default = current use resolved HEAD push: fail early with detached HEAD and current push: factor out the detached HEAD error message
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions