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

	Commit message (Expand)	Author	Age
*	Merge branch 'sb/sequencer-abort-safety'	Junio C Hamano	2016-12-21
\|\
\| *	am: change safe_to_abort()'s not rewinding error into a warning	Stephan Beyer	2016-12-08
\| *	am: fix filename in safe_to_abort() error message	Stephan Beyer	2016-12-08
* \|	hold_locked_index(): align error handling with hold_lockfile_for_update()	Junio C Hamano	2016-12-07
\|/
*	Merge branch 'bc/object-id'	Junio C Hamano	2016-09-19
\|\
\| *	builtin/am: convert to struct object_id	brian m. carlson	2016-09-07
* \|	Merge branch 'cc/apply-am'	Junio C Hamano	2016-09-19
\|\ \
\| * \|	builtin/am: use apply API in run_apply()	Christian Couder	2016-09-07
* \| \|	Merge branch 'ah/misc-message-fixes'	Junio C Hamano	2016-09-15
\|\ \ \
\| * \| \|	am: put spaces around pipe in usage string	Alex Henrie	2016-09-08
\| \| \|/ \| \|/\|
* \| \|	am: refactor read_author_script()	Junio C Hamano	2016-08-30
\|/ /
* \|	Merge branch 'js/am-3-merge-recursive-direct'	Junio C Hamano	2016-08-10
\|\ \
\| * \|	am -3: use merge_recursive() directly again	Johannes Schindelin	2016-07-26
\| \|/
* \|	Merge branch 'jk/reset-ident-time-per-commit'	Junio C Hamano	2016-08-10
\|\ \ \| \|/ \|/\|
\| *	am: reset cached ident date for each patch	Jeff King	2016-08-01
* \|	Merge branch 'js/am-call-theirs-theirs-in-fallback-3way'	Junio C Hamano	2016-07-19
\|\ \
\| * \|	am: counteract gender bias	Johannes Schindelin	2016-07-08
\| \|/
* \|	Merge branch 'jk/write-file'	Junio C Hamano	2016-07-19
\|\ \
\| * \|	use write_file_buf where applicable	Jeff King	2016-07-08
\| * \|	am: ignore return value of write_file()	René Scharfe	2016-07-08
* \| \|	am: support --patch-format=mboxrd	Eric Wong	2016-06-06
\|/ /
* \|	builtin/am.c: use error_errno()	Nguyễn Thái Ngọc Duy	2016-05-09
\|/
*	Merge branch 'jc/am-i-v-fix'	Junio C Hamano	2016-02-24
\|\
\| *	am -i: fix "v"iew	Junio C Hamano	2016-02-17
* \|	Merge branch 'nd/diff-with-path-params'	Junio C Hamano	2016-02-03
\|\ \
\| * \|	diff: make -O and --output work in subdirectory	Duy Nguyen	2016-01-21
\| * \|	Merge branch 'jc/am-3-fallback-regression-fix' into maint	Junio C Hamano	2015-11-03
\| \|\ \
\| * \ \	Merge branch 'rt/placeholder-in-usage' into maint	Junio C Hamano	2015-11-03
\| \|\ \ \
\| * \ \ \	Merge branch 'tk/stripspace' into maint	Junio C Hamano	2015-11-03
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'pt/am-builtin' into maint	Junio C Hamano	2015-10-16
\| \|\ \ \ \ \
* \| \ \ \ \ \	Merge branch 'jc/strbuf-getline'	Junio C Hamano	2016-01-28
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	strbuf: give strbuf_getline() to the "most text friendly" variant	Junio C Hamano	2016-01-15
\| * \| \| \| \| \| \|	strbuf: introduce strbuf_getline_{lf,nul}()	Junio C Hamano	2016-01-15
\| * \| \| \| \| \| \|	strbuf: make strbuf_getline_crlf() global	Junio C Hamano	2016-01-14
* \| \| \| \| \| \| \|	am: release pack files before garbage-collecting	Johannes Schindelin	2016-01-13
\|/ / / / / / /
* \| \| \| \| \| \|	Convert struct object to object_id	brian m. carlson	2015-11-20
* \| \| \| \| \| \|	Merge branch 'jc/am-mailinfo-direct'	Junio C Hamano	2015-10-29
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	am: make direct call to mailinfo	Junio C Hamano	2015-10-21
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'tk/stripspace'	Junio C Hamano	2015-10-26
\|\ \ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	strbuf: make stripspace() part of strbuf	Tobias Klauser	2015-10-16
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'rt/placeholder-in-usage'	Junio C Hamano	2015-10-26
\|\ \ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	am, credential-cache: add angle brackets to usage string	Ralf Thielow	2015-10-16
\| \|/ / / /
* \| \| \| \|	Merge branch 'jc/am-3-fallback-regression-fix'	Junio C Hamano	2015-10-26
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	am -3: do not let failed merge from completing the error codepath	Junio C Hamano	2015-10-09
\| \|/ / /
* \| \| \|	Merge branch 'pt/am-builtin'	Junio C Hamano	2015-10-15
\|\ \ \ \ \| \|/ / / \|/\| / / \| \|/ /
\| * \|	am: configure gpg at startup	Renee Margaret McConahy	2015-09-30
* \| \|	Merge branch 'jc/builtin-am-signoff-regression-fix'	Junio C Hamano	2015-09-08
\|\ \ \
\| * \| \|	am: match --signoff to the original scripted version	Junio C Hamano	2015-09-06
* \| \| \|	rerere: release lockfile in non-writing functions	Jeff King	2015-09-01
* \| \| \|	Merge branch 'jc/am-state-fix'	Junio C Hamano	2015-08-31
\|\ \ \ \