git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 130be8e 53c76dc)
Merge branch 'kd/pull-rebase-autostash'
authorJunio C Hamano <redacted>
Mon, 17 Aug 2015 22:07:50 +0000 (15:07 -0700)
committerJunio C Hamano <redacted>
Mon, 17 Aug 2015 22:07:50 +0000 (15:07 -0700)
commite69b40828070b71c423820d1e35d5fb1e5b1a550
treef6cb843ebe7caa8b57074cf41ab5d4fdcf6270c8tree | snapshot
parent130be8eeb8b9b7c89751c3cab3bc54dc6f2d43e6commit | diff
parent53c76dc05e0b5ad5b1f92db9577694e896d67a0acommit | diff
Merge branch 'kd/pull-rebase-autostash'

"git pull --rebase" has been taught to pay attention to
rebase.autostash configuration.

* kd/pull-rebase-autostash:
  pull: allow dirty tree when rebase.autostash enabled
t/t5520-pull.sh diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT