aboutsummaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-04 00:01:52 -0700
committerJunio C Hamano <junkio@cox.net>2006-06-04 00:01:52 -0700
commitf63237a18e951b93ac46a0e594f286255e1eaaaf (patch)
treea131e9466bc5ca7ca42e31e71274ce3152dc8615 /xdiff
parentb9d301bca767c9c26b8514fb326dd237cb269fbb (diff)
parente96fd30553bb57a76ad38f703a3fea5b53c45ff9 (diff)
downloadgit-f63237a18e951b93ac46a0e594f286255e1eaaaf.tar.gz
git-f63237a18e951b93ac46a0e594f286255e1eaaaf.tar.xz
Merge branch 'vb/sendemail' into next
* vb/sendemail: Cleanup git-send-email.perl:extract_valid_email read-tree --reset: update working tree file for conflicted paths. Documentation: Spelling fixes Builtin git-rev-parse. fetch: do not report "same" unless -verbose.
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions