Junio C Hamano 0fc3158a2a Merge branch 'jn/git-cmd-h-bypass-setup' into next ...

* jn/git-cmd-h-bypass-setup:
  update-index -h: show usage even with corrupt index
  merge -h: show usage even with corrupt index
  ls-files -h: show usage even with corrupt index
  gc -h: show usage even with broken configuration
  commit/status -h: show usage even with broken configuration
  checkout-index -h: show usage even in an invalid repository
  branch -h: show usage even in an invalid repository

Conflicts:
	builtin/merge.c

2010-12-08 12:25:24 -08:00

40 KiB

Raw Blame History

View Raw