summaryrefslogtreecommitdiff
path: root/refs.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-22 06:27:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-22 06:27:29 (GMT)
commitd25c72f7da5116f7b7a1f88a59d2bc14415a03b2 (patch)
tree74d5fcea2044616ca648d60004bb24623f62997b /refs.c
parent2eb54692d145a0c2939698302e913975f059ac34 (diff)
parentcf65426de682bf4e336eddd2964a7c1585597f48 (diff)
downloadgit-d25c72f7da5116f7b7a1f88a59d2bc14415a03b2.zip
git-d25c72f7da5116f7b7a1f88a59d2bc14415a03b2.tar.gz
git-d25c72f7da5116f7b7a1f88a59d2bc14415a03b2.tar.bz2
Merge branch 'en/rebase-against-rebase-fix'
* en/rebase-against-rebase-fix: pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
Diffstat (limited to 'refs.c')
0 files changed, 0 insertions, 0 deletions