diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-03-07 12:47:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-07 12:47:16 -0800 |
| commit | 796a01c41ca0b66f798571c7e876b3de4607f498 (patch) | |
| tree | ce87bc42b13af342454b377400083b816b0e2668 /Documentation/git-merge.txt | |
| parent | Merge branch 'jc/fetch-param' (diff) | |
| parent | push: fix segfault for odd config (diff) | |
| download | tgif-796a01c41ca0b66f798571c7e876b3de4607f498.tar.xz | |
Merge branch 'jk/maint-push-tracking-wo-remote'
* jk/maint-push-tracking-wo-remote:
push: fix segfault for odd config
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions