git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8132f2c 51be46e)
Merge branch 'ap/remote-hg-skip-null-bookmarks'
authorJunio C Hamano <redacted>
Wed, 2 Apr 2014 21:18:23 +0000 (14:18 -0700)
committerJunio C Hamano <redacted>
Wed, 2 Apr 2014 21:18:23 +0000 (14:18 -0700)
* ap/remote-hg-skip-null-bookmarks:
  remote-hg: do not fail on invalid bookmarks

1  2 
contrib/remote-helpers/git-remote-hg patch | diff1 | diff2 | blob | history
contrib/remote-helpers/test-hg.sh patch | diff1 | diff2 | blob | history

diff --cc contrib/remote-helpers/git-remote-hg
Simple merge
diff --cc contrib/remote-helpers/test-hg.sh
Simple merge
git clone https://git.99rst.org/PROJECT