summaryrefslogtreecommitdiff
path: root/xdiff/xprepare.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-07-24 09:27:09 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-07-24 09:27:09 -0700
commitf87dd2152a6941dfa7f3ddaf599bc30f58562a98 (patch)
tree308c66f7be4942b01b468e958cb7c9c64dd39131 /xdiff/xprepare.c
parentgit svn: fix shallow clone when upstream revision is too new (diff)
parentSunOS grep does not understand -C<n> nor -e (diff)
downloadtgif-f87dd2152a6941dfa7f3ddaf599bc30f58562a98.tar.xz
Merge branch 'maint'
* maint: SunOS grep does not understand -C<n> nor -e Fix export_marks() error handling. git branch: clean up detached branch handling git branch: avoid unnecessary object lookups git branch: fix performance problem do_one_ref(): null_sha1 check is not about broken ref Conflicts: Makefile
Diffstat (limited to 'xdiff/xprepare.c')
0 files changed, 0 insertions, 0 deletions