Junio C Hamano a7cf60f062 Merge branch 'master' into next ...

* master:
  git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'
  Fix sparse warnings
  bisect: visualize with git-log if gitk is unavailable

Conflicts:
	submodule.c

2011-03-22 14:56:58 -07:00

20 KiB

Raw Blame History

View Raw