]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1c9f544 aa9ea77)
Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1
authorJunio C Hamano <gitster@pobox.com>
Thu, 9 Apr 2009 06:02:17 +0000 (23:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Apr 2009 06:02:17 +0000 (23:02 -0700)
commitbb11eb31a2e7da7f878dd501d39f6877ec00eb7d
tree4522f1b81040585f03b586200340e8bf7586bf46tree | snapshot
parent1c9f54417e22103a04c51293369a48b6d3386ac4commit | diff
parentaa9ea77de4fffd133b3da1d36a19fd0bd11ad368commit | diff
Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1

* jc/maint-1.6.0-blame-s:
  blame: read custom grafts given by -S before calling setup_revisions()

Conflicts:
builtin-blame.c
builtin-blame.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.