diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-05-05 19:15:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-05 19:15:39 -0700 |
| commit | dc484f2213a34ced5abe5eb968650035204b6035 (patch) | |
| tree | 1e1d0d7563cc91bd52ffcb895b9f21a0ed2607c8 /Documentation/merge-strategies.txt | |
| parent | post-merge: Add it's not executed if merge failed. (diff) | |
| parent | Add a remote.*.mirror configuration option (diff) | |
| download | tgif-dc484f2213a34ced5abe5eb968650035204b6035.tar.xz | |
Merge branch 'pb/remote-mirror-config'
* pb/remote-mirror-config:
Add a remote.*.mirror configuration option
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions