diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-07-03 15:41:17 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-07-03 15:41:17 -0700 |
commit | 4efd16543fe1c0871742dbd33d6adc2acfd11c3c (patch) | |
tree | 322061af94a0b48657d617e47c3b2705381dac31 /notes-merge.c | |
parent | Merge branch 'cr/git-work-tree-sans-git-dir' into maint (diff) | |
parent | diffcore-pickaxe doc: document -S and -G properly (diff) | |
download | tgif-4efd16543fe1c0871742dbd33d6adc2acfd11c3c.tar.xz |
Merge branch 'rr/diffcore-pickaxe-doc' into maint
* rr/diffcore-pickaxe-doc:
diffcore-pickaxe doc: document -S and -G properly
diffcore-pickaxe: make error messages more consistent
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions