git.tremily.us Git - git.git/commit

author	Junio C Hamano <gitster@pobox.com>
	Mon, 17 Sep 2012 22:59:34 +0000 (15:59 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Mon, 17 Sep 2012 22:59:34 +0000 (15:59 -0700)
commit	b61f55be0060ab47b154d979f919dd969f29d314
tree	3566700e4b8f8d992d9e599b7a933473a3139ea9	tree \| snapshot
parent	26f4f2c74e2632b708ba3dd4ae2e69d359878ccd	commit \| diff
parent	5805853f228acafe1d45edeef780cd1b00b952aa	commit \| diff

Merge branch 'maint'

* maint:
  t/perf: add "trash directory" to .gitignore
  Add missing -z to git check-attr usage text for consistency with man page
  git-jump: ignore (custom) prefix in diff mode
  Documentation: indent-with-non-tab uses "equivalent tabs" not 8
  completion: add --no-edit to git-commit

Documentation/config.txt	diff1 \|	diff2 \|	blob \| history
builtin/check-attr.c	diff1 \|	diff2 \|	blob \| history
contrib/completion/git-completion.bash	diff1 \|	diff2 \|	blob \| history

Git—the stupid content tracker

RSS Atom

Documentation/config.txt	diff1 \|	diff2 \|	blob \| history
builtin/check-attr.c	diff1 \|	diff2 \|	blob \| history
contrib/completion/git-completion.bash	diff1 \|	diff2 \|	blob \| history