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

	Commit message (Expand)	Author	Age
*	Merge branch 'jk/war-on-git-path'	Junio C Hamano	2017-04-26
\|\
\| *	use git_path_* helper functions	Jeff King	2017-04-20
* \|	Rename sha1_array to oid_array	brian m. carlson	2017-03-31
* \|	Make sha1_array_append take a struct object_id *	brian m. carlson	2017-03-31
* \|	sha1-array: convert internal storage for struct sha1_array to object_id	brian m. carlson	2017-03-28
* \|	builtin/pull: convert to struct object_id	brian m. carlson	2017-03-28
* \|	builtin/pull: convert portions to struct object_id	brian m. carlson	2017-03-26
\|/
*	Merge branch 'jc/pull-rebase-ff'	Junio C Hamano	2016-12-19
\|\
\| *	pull: fast-forward "pull --rebase=true"	Junio C Hamano	2016-11-29
* \|	wt-status: teach has_{unstaged,uncommitted}_changes() about submodules	Johannes Schindelin	2016-10-07
* \|	wt-status: make the require_clean_work_tree() function reusable	Johannes Schindelin	2016-10-07
* \|	pull: make code more similar to the shell script again	Johannes Schindelin	2016-10-07
* \|	pull: drop confusing prefix parameter of die_on_unclean_work_tree()	Johannes Schindelin	2016-10-07
* \|	Merge branch 'va/i18n-even-more'	Junio C Hamano	2016-07-13
\|\ \
\| * \|	i18n: advice: internationalize message for conflicts	Vasco Almeida	2016-06-17
* \| \|	pull: warn on --verify-signatures with --rebase	Alexander Hirsch	2016-05-20
\|/ /
* \|	Merge branch 'va/i18n-misc-updates'	Junio C Hamano	2016-05-17
\|\ \
\| * \|	i18n: builtin/pull.c: split strings marked for translation	Vasco Almeida	2016-04-19
\| * \|	i18n: builtin/pull.c: mark placeholders for translation	Vasco Almeida	2016-04-19
* \| \|	Merge branch 'jc/merge-refuse-new-root'	Junio C Hamano	2016-04-29
\|\ \ \
\| * \| \|	pull: pass --allow-unrelated-histories to "git merge"	Junio C Hamano	2016-04-21
* \| \| \|	pull --rebase: add --[no-]autostash flag	Mehul Jain	2016-03-21
* \| \| \|	git-pull.c: introduce git_pull_config()	Mehul Jain	2016-03-21
\| \|/ / \|/\| \|
* \| \|	Merge branch 'jc/strbuf-getline'	Junio C Hamano	2016-01-28
\|\ \ \
\| * \| \|	strbuf: introduce strbuf_getline_{lf,nul}()	Junio C Hamano	2016-01-15
\| \|/ /
* \| \|	Merge branch 'js/pull-rebase-i'	Junio C Hamano	2016-01-26
\|\ \ \
\| * \| \|	pull: allow interactive rebase with --rebase=interactive	Johannes Schindelin	2016-01-13
\| \|/ /
* \| \|	submodules: allow parallel fetching, add tests and documentation	Stefan Beller	2015-12-16
\|/ /
* \|	Remove get_object_hash.	brian m. carlson	2015-11-20
* \|	Convert struct object to object_id	brian m. carlson	2015-11-20
\|/
*	Merge branch 'pt/pull-builtin' into maint	Junio C Hamano	2015-10-16
\|\
\| *	pull: enclose <options> in brackets in the usage string	Alex Henrie	2015-10-16
* \|	pull: don't mark values for option "rebase" for translation	Ralf Thielow	2015-09-11
* \|	Merge branch 'mh/tempfile'	Junio C Hamano	2015-08-25
* \|	pull: allow dirty tree when rebase.autostash enabled	Kevin Daudt	2015-07-22
\|/
*	pull: remove redirection to git-pull.sh	Paul Tan	2015-06-18
*	pull --rebase: error on no merge candidate cases	Paul Tan	2015-06-18
*	pull --rebase: exit early when the working directory is dirty	Paul Tan	2015-06-18
*	pull: configure --rebase via branch.<name>.rebase or pull.rebase	Paul Tan	2015-06-18
*	pull: teach git pull about --rebase	Paul Tan	2015-06-18
*	pull: set reflog message	Paul Tan	2015-06-18
*	pull: implement pulling into an unborn branch	Paul Tan	2015-06-18
*	pull: fast-forward working tree if head is updated	Paul Tan	2015-06-18
*	pull: check if in unresolved merge state	Paul Tan	2015-06-18
*	pull: support pull.ff config	Paul Tan	2015-06-18
*	pull: error on no merge candidates	Paul Tan	2015-06-18
*	pull: pass git-fetch's options to git-fetch	Paul Tan	2015-06-18
*	pull: pass git-merge's options to git-merge	Paul Tan	2015-06-15
*	pull: pass verbosity, --progress flags to fetch and merge	Paul Tan	2015-06-15
*	pull: implement fetch + merge	Paul Tan	2015-06-15