]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0c76270 035b5bf)
Merge branch 'jk/pull-rebase-with-work-tree'
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Oct 2011 04:37:14 +0000 (21:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Oct 2011 04:37:14 +0000 (21:37 -0700)
commitf2b516352527c6ddf338143e4ade0ef4713f85eb
tree1876df9a5d1726ef3182b0b11c8aa943fb12302atree | snapshot
parent0c762702a061c57f1482cc7405989b9373165e40commit | diff
parent035b5bf6431dbf8f3cde2f44b0d7ef893b95b605commit | diff
Merge branch 'jk/pull-rebase-with-work-tree'

* jk/pull-rebase-with-work-tree:
  pull,rebase: handle GIT_WORK_TREE better

Conflicts:
git-pull.sh
git-pull.sh diff1 | diff2 | blob | history
git-rebase.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.