diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-09-12 14:10:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-12 14:12:48 -0700 |
| commit | e70d1632bdaf25a9ee528e78133cab319083eade (patch) | |
| tree | 740ec85d44857ebf40dbe4e6318545fdaa506b18 /combine-diff.c | |
| parent | Merge branch 'maint-1.7.11' into maint (diff) | |
| download | tgif-e70d1632bdaf25a9ee528e78133cab319083eade.tar.xz | |
Further merging in preparation for 1.7.12.1
Describe the following in the draft release notes:
. jc/apply-binary-p0
. jc/dotdot-is-parent-directory
. jc/maint-doc-checkout-b-always-takes-branch-name
. jk/maint-http-half-auth-push
. kk/maint-for-each-ref-multi-sort
Yet to be merged before 1.7.12.1 are:
. jk/config-warn-on-inaccessible-paths
. jk/maint-quiet-is-synonym-to-s-in-log
. mz/cherry-pick-cmdline-order
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions