org/kernel/git.git - forked from git/git

	Commit message (Expand)	Author	Age
*	Merge branch 'sg/completion-commit-cleanup'	Junio C Hamano	2015-06-24
\|\
\| *	completion: teach 'scissors' mode to 'git commit --cleanup='	SZEDER Gábor	2015-06-08
* \|	Merge branch 'pt/am-abort-fix'	Junio C Hamano	2015-06-24
\|\ \
\| * \|	am --abort: keep unrelated commits on unborn branch	Paul Tan	2015-06-08
\| * \|	am --abort: support aborting to unborn branch	Paul Tan	2015-06-08
\| * \|	am --abort: revert changes introduced by failed 3way merge	Paul Tan	2015-06-08
\| * \|	am --skip: support skipping while on unborn branch	Paul Tan	2015-06-08
\| * \|	am -3: support 3way merge on unborn branch	Paul Tan	2015-06-08
\| * \|	am --skip: revert changes introduced by failed 3way merge	Paul Tan	2015-06-08
* \| \|	Merge branch 'nd/untracked-cache'	Junio C Hamano	2015-06-24
\|\ \ \
\| * \| \|	read-cache: fix untracked cache invalidation when split-index is used	Nguyễn Thái Ngọc Duy	2015-06-08
* \| \| \|	Merge branch 'mh/fsck-reflog-entries'	Junio C Hamano	2015-06-24
\|\ \ \ \
\| * \| \| \|	fsck: report errors if reflog entries point at invalid objects	Michael Haggerty	2015-06-08
\| * \| \| \|	fsck_handle_reflog_sha1(): new function	Michael Haggerty	2015-06-08
* \| \| \| \|	Merge branch 'js/sleep-without-select'	Junio C Hamano	2015-06-24
\|\ \ \ \ \
\| * \| \| \| \|	lockfile: wait using sleep_millisec() instead of select()	Johannes Sixt	2015-06-05
\| * \| \| \| \|	lockfile: convert retry timeout computations to millisecond	Johannes Sixt	2015-06-05
\| * \| \| \| \|	help.c: wrap wait-only poll() invocation in sleep_millisec()	Johannes Sixt	2015-06-05
\| * \| \| \| \|	lockfile: replace random() by rand()	Johannes Sixt	2015-06-05
* \| \| \| \| \|	Merge branch 'es/utf8-stupid-compiler-workaround'	Junio C Hamano	2015-06-24
\|\ \ \ \ \ \
\| * \| \| \| \| \|	utf8: NO_ICONV: silence uninitialized variable warning	Eric Sunshine	2015-06-05
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'rl/am-3way-config'	Junio C Hamano	2015-06-24
\|\ \ \ \ \ \
\| * \| \| \| \| \|	git-am: add am.threeWay config variable	Remi Lespinet	2015-06-04
\| * \| \| \| \| \|	t4150-am: refactor am -3 tests	Remi Lespinet	2015-06-04
\| * \| \| \| \| \|	git-am.sh: fix initialization of the threeway variable	Remi Lespinet	2015-06-04
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'jc/ll-merge-expose-path'	Junio C Hamano	2015-06-24
\|\ \ \ \ \ \
\| * \| \| \| \| \|	ll-merge: pass the original path to external drivers	Junio C Hamano	2015-06-04
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'es/osx-header-pollutes-mask-macro'	Junio C Hamano	2015-06-24
\|\ \ \ \ \ \
\| * \| \| \| \| \|	ewah: use less generic macro name	Jeff King	2015-06-03
\| * \| \| \| \| \|	ewah/bitmap: silence warning about MASK macro redefinition	Eric Sunshine	2015-06-03
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'es/configure-getdelim'	Junio C Hamano	2015-06-24
\|\ \ \ \ \ \
\| * \| \| \| \| \|	configure: add getdelim() check	Eric Sunshine	2015-06-03
\| * \| \| \| \| \|	config.mak.uname: Darwin: define HAVE_GETDELIM for modern OS X releases	Eric Sunshine	2015-06-03
* \| \| \| \| \| \|	Merge branch 'pt/pull-optparse'	Junio C Hamano	2015-06-24
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	pull: use git-rev-parse --parseopt for option parsing	Paul Tan	2015-06-02
\| * \| \| \| \| \| \|	pull: handle git-fetch's options as well	Paul Tan	2015-06-02
\| * \| \| \| \| \| \|	Merge branch 'pt/pull-tests' into pt/pull-optparse	Junio C Hamano	2015-06-02
\| \|\ \ \ \ \ \ \
* \| \ \ \ \ \ \ \	Merge branch 'qn/blame-show-email'	Junio C Hamano	2015-06-24
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	blame: add blame.showEmail configuration	Quentin Neill	2015-06-01
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks'	Junio C Hamano	2015-06-24
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	format-patch: do not feed tags to clear_commit_marks()	Junio C Hamano	2015-06-01
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'es/send-email-sendmail-alias'	Junio C Hamano	2015-06-24
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	send-email: further warn about unsupported sendmail aliases features	Eric Sunshine	2015-06-01
\| * \| \| \| \| \| \| \| \|	t9001: add sendmail aliases line continuation tests	Eric Sunshine	2015-06-01
\| * \| \| \| \| \| \| \| \|	t9001: refactor sendmail aliases test infrastructure	Eric Sunshine	2015-06-01
\| * \| \| \| \| \| \| \| \|	send-email: implement sendmail aliases line continuation support	Eric Sunshine	2015-06-01
\| * \| \| \| \| \| \| \| \|	send-email: simplify sendmail aliases comment and blank line recognizer	Eric Sunshine	2015-06-01
\| * \| \| \| \| \| \| \| \|	send-email: refactor sendmail aliases parser	Eric Sunshine	2015-06-01
\| * \| \| \| \| \| \| \| \|	send-email: fix style: cuddle 'elsif' and 'else' with closing brace	Eric Sunshine	2015-06-01
\| * \| \| \| \| \| \| \| \|	send-email: drop noise comments which merely repeat what code says	Eric Sunshine	2015-06-01