Junio C Hamano d55fdfa731 Merge branch 'jc/leftright' into next ...

* jc/leftright:
  Make left-right automatic.
  Teach all of log family --left-right output.
  rev-list --left-right
  markup fix in svnimport documentation.
  Documentation: new option -P for git-svnimport
  Fix mis-mark-up in git-merge-file.txt documentation
  Default GIT_COMMITTER_NAME to login name in recieve-pack.
  Fix check_file_directory_conflict().
  git-add: remove conflicting entry when adding.
  update-index: make D/F conflict error a bit more verbose.

2006-12-17 10:36:25 -08:00

23 KiB

Raw Blame History

View Raw