]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad62fd0 9727601)
Merge branch 'jk/filter-branch-come-back-to-original' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 18:26:55 +0000 (11:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 18:26:55 +0000 (11:26 -0700)
* jk/filter-branch-come-back-to-original:
  filter-branch: return to original dir after filtering

1  2 
git-filter-branch.sh patch | diff1 | diff2 | blob | history
t/t7003-filter-branch.sh patch | diff1 | diff2 | blob | history

diff --cc git-filter-branch.sh
Simple merge
diff --cc t/t7003-filter-branch.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.