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

	Commit message (Expand)	Author	Age
*	Merge branch 'db/push-sign-if-asked'	Junio C Hamano	2015-08-31
\|\
\| *	push: add a config option push.gpgSign for default signed pushes	Dave Borowitz	2015-08-19
\| *	Merge branch 'jk/color-diff-plain-is-context' into maint	Junio C Hamano	2015-06-25
\| \|\
\| * \	Merge branch 'pt/pull-ff-vs-merge-ff' into maint	Junio C Hamano	2015-06-05
\| \|\ \
\| * \ \	Merge branch 'jk/asciidoc-markup-fix' into maint	Junio C Hamano	2015-06-05
\| \|\ \ \
* \| \ \ \	Merge branch 'jk/notes-merge-config'	Junio C Hamano	2015-08-31
\|\ \ \ \ \
\| * \| \| \| \|	notes: teach git-notes about notes.<name>.mergeStrategy option	Jacob Keller	2015-08-17
\| * \| \| \| \|	notes: add notes.mergeStrategy option to select default strategy	Jacob Keller	2015-08-17
\| * \| \| \| \|	notes: document cat_sort_uniq rewriteMode	Jacob Keller	2015-08-17
* \| \| \| \| \|	Merge branch 'as/docfix-reflog-expire-unreachable'	Junio C Hamano	2015-08-26
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Documentation/config: fix inconsistent label on gc.*.reflogExpireUnreachable	Andreas Schwab	2015-08-21
* \| \| \| \| \| \|	Merge branch 'ep/http-configure-ssl-version'	Junio C Hamano	2015-08-26
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	http: add support for specifying the SSL version	Elia Pinto	2015-08-17
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'jk/negative-hiderefs'	Junio C Hamano	2015-08-19
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	refs: support negative transfer.hideRefs	Jeff King	2015-08-07
\| * \| \| \| \| \| \|	docs/config.txt: reorder hideRefs config	Jeff King	2015-07-28
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'es/worktree-add-cleanup'	Junio C Hamano	2015-08-12
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Documentation/config: mention "now" and "never" for 'expire' settings	Eric Sunshine	2015-07-28
* \| \| \| \| \| \| \|	Merge branch 'pt/am-builtin'	Junio C Hamano	2015-08-12
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	git-am: add am.threeWay config variable	Remi Lespinet	2015-08-04
* \| \| \| \| \| \| \| \|	Merge branch 'es/worktree-add'	Junio C Hamano	2015-08-12
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| / / / / / / / \| \|/ / / / / / /
\| * \| \| \| \| \| \|	config: rename "gc.pruneWorktreesExpire" to "gc.worktreePruneExpire"	Eric Sunshine	2015-07-20
\| * \| \| \| \| \| \|	Documentation/git-worktree: wordsmith worktree-related manpages	Michael Haggerty	2015-07-20
\| * \| \| \| \| \| \|	Documentation/config: fix stale "git prune --worktree" reference	Michael Haggerty	2015-07-20
* \| \| \| \| \| \| \|	Merge branch 'gr/rebase-i-drop-warn'	Junio C Hamano	2015-08-03
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	git rebase -i: warn about removed commits	Galan Rémi	2015-06-30
* \| \| \| \| \| \| \| \|	Merge branch 'js/fsck-opt'	Junio C Hamano	2015-08-03
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	fsck: support ignoring objects in `git fsck` via fsck.skiplist	Johannes Schindelin	2015-06-23
\| * \| \| \| \| \| \| \| \|	fsck: git receive-pack: support excluding objects from fsck'ing	Johannes Schindelin	2015-06-23
\| * \| \| \| \| \| \| \| \|	fsck: support demoting errors to warnings	Johannes Schindelin	2015-06-23
\| * \| \| \| \| \| \| \| \|	fsck: document the new receive.fsck.<msg-id> options	Johannes Schindelin	2015-06-23
* \| \| \| \| \| \| \| \| \|	Merge branch 'mr/rebase-i-customize-insn-sheet'	Junio C Hamano	2015-08-03
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	git-rebase--interactive.sh: add config option for custom instruction format	Michael Rappazzo	2015-06-15
* \| \| \| \| \| \| \| \| \|	Revert "git-am: add am.threeWay config variable"	Junio C Hamano	2015-07-24
* \| \| \| \| \| \| \| \| \|	Merge branch 'rl/am-3way-config'	Junio C Hamano	2015-06-24
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	git-am: add am.threeWay config variable	Remi Lespinet	2015-06-04
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'jk/color-diff-plain-is-context'	Junio C Hamano	2015-06-11
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| / \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	diff: accept color.diff.context as a synonym for "plain"	Jeff King	2015-05-27
* \| \| \| \| \| \| \|	Merge branch 'fm/fetch-raw-sha1'	Junio C Hamano	2015-06-01
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	upload-pack: optionally allow fetching reachable sha1	Fredrik Medley	2015-05-22
\| * \| \| \| \| \| \|	config.txt: clarify allowTipSHA1InWant with camelCase	Fredrik Medley	2015-05-21
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'pt/pull-ff-vs-merge-ff'	Junio C Hamano	2015-05-26
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	pull: make pull.ff=true override merge.ff	Paul Tan	2015-05-18
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'mh/lockfile-retry'	Junio C Hamano	2015-05-22
\|\ \ \ \ \ \
\| * \| \| \| \| \|	lock_packed_refs(): allow retries when acquiring the packed-refs lock	Michael Haggerty	2015-05-14
* \| \| \| \| \| \|	Merge branch 'jk/asciidoc-markup-fix'	Junio C Hamano	2015-05-22
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	doc: convert \--option to --option	Jeff King	2015-05-12
* \| \| \| \| \| \|	Merge branch 'ls/http-ssl-cipher-list'	Junio C Hamano	2015-05-22
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	http: add support for specifying an SSL cipher list	Lars Kellogg-Stedman	2015-05-08
\| \|/ / / / /
\| * \| \| \| \|	Merge branch 'mg/doc-status-color-slot' into maint	Junio C Hamano	2015-03-23
\| \|\ \ \ \ \