diff options
author | Junio C Hamano <junkio@cox.net> | 2007-03-05 17:07:17 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-03-05 17:07:17 -0800 |
commit | c2d4eb7e04397595aa1369414aaab52f27bb9e3a (patch) | |
tree | 79438c1ce0674bafb0d06b767d12b8e423364d1b /Documentation/git.txt | |
parent | 56333bac66ccdefa3f6d67f78da9f5267119c4a6 (diff) | |
parent | 2f6dc35d2ad0bd2a8648902a692f087f47d1ee86 (diff) | |
download | git-c2d4eb7e04397595aa1369414aaab52f27bb9e3a.tar.gz git-c2d4eb7e04397595aa1369414aaab52f27bb9e3a.tar.xz |
Merge branch 'maint-for-junio' of git://repo.or.cz/git/fastimport into maint
* 'maint-for-junio' of git://repo.or.cz/git/fastimport:
fast-import: Fail if a non-existant commit is used for merge
fast-import: Avoid infinite loop after reset
Diffstat (limited to 'Documentation/git.txt')
0 files changed, 0 insertions, 0 deletions