summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-05-05 19:15:39 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-05-05 19:15:39 -0700
commitdc484f2213a34ced5abe5eb968650035204b6035 (patch)
tree1e1d0d7563cc91bd52ffcb895b9f21a0ed2607c8 /Documentation/git-merge-file.txt
parentpost-merge: Add it's not executed if merge failed. (diff)
parentAdd a remote.*.mirror configuration option (diff)
downloadtgif-dc484f2213a34ced5abe5eb968650035204b6035.tar.xz
Merge branch 'pb/remote-mirror-config'
* pb/remote-mirror-config: Add a remote.*.mirror configuration option
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions