summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-09-09 02:32:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-09-09 02:32:24 -0700
commit57543a254c6aef8fca5556e25a9fa6dd5622b037 (patch)
tree022b6895b107d5c81e6b9a4f211c06ca5f1c17c0 /xdiff
parentgit-rebase: fix -C option (diff)
parentgit-svn: understand grafts when doing dcommit (diff)
downloadtgif-57543a254c6aef8fca5556e25a9fa6dd5622b037.tar.xz
Merge branch 'maint'
* maint: git-svn: understand grafts when doing dcommit git-diff: don't squelch the new SHA1 in submodule diffs git-svn: fix "Malformed network data" with svn:// servers (cvs|svn)import: Ask git-tag to overwrite old tags. Documentation / grammer nit
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions