delta/git.git - github.com: git/git.git

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'sb/pull-rebase-submodule'	Junio C Hamano	2017-07-13	1	-10/+63
\|\
\| *	pull: optionally rebase submodules (remote submodule changes only)	Stefan Beller	2017-06-23	1	-10/+63
* \|	Merge branch 'bw/config-h'	Junio C Hamano	2017-06-24	1	-0/+1
\|\ \ \| \|/ \|/\|
\| *	config: don't include config.h by default	Brandon Williams	2017-06-15	1	-0/+1
* \|	Merge branch 'nd/fopen-errors'	Junio C Hamano	2017-06-13	1	-2/+1
\|\ \
\| * \|	use xfopen() in more places	Nguyễn Thái Ngọc Duy	2017-05-26	1	-2/+1
\| \|/
* \|	Merge branch 'tb/pull-ff-rebase-autostash'	Junio C Hamano	2017-06-05	1	-11/+14
\|\ \
\| * \|	pull: ff --rebase --autostash works in dirty repotb/pull-ff-rebase-autostash	Tyler Brazier	2017-06-01	1	-11/+14
\| \|/
* \|	merge: convert checkout_fast_forward to struct object_id	brian m. carlson	2017-05-08	1	-2/+2
* \|	Convert lookup_commit* to struct object_id	brian m. carlson	2017-05-08	1	-5/+5
\|/
*	Merge branch 'jk/war-on-git-path'	Junio C Hamano	2017-04-26	1	-2/+2
\|\
\| *	use git_path_* helper functions	Jeff King	2017-04-20	1	-2/+2
* \|	Rename sha1_array to oid_array	brian m. carlson	2017-03-31	1	-3/+3
* \|	Make sha1_array_append take a struct object_id *	brian m. carlson	2017-03-31	1	-1/+1
* \|	sha1-array: convert internal storage for struct sha1_array to object_id	brian m. carlson	2017-03-28	1	-11/+11
* \|	builtin/pull: convert to struct object_id	brian m. carlson	2017-03-28	1	-36/+36
* \|	builtin/pull: convert portions to struct object_id	brian m. carlson	2017-03-26	1	-3/+3
\|/
*	Merge branch 'jc/pull-rebase-ff'	Junio C Hamano	2016-12-19	1	-4/+18
\|\
\| *	pull: fast-forward "pull --rebase=true"jc/pull-rebase-ff	Junio C Hamano	2016-11-29	1	-4/+18
* \|	wt-status: teach has_{unstaged,uncommitted}_changes() about submodules	Johannes Schindelin	2016-10-07	1	-1/+1
* \|	wt-status: make the require_clean_work_tree() function reusable	Johannes Schindelin	2016-10-07	1	-76/+1
* \|	pull: make code more similar to the shell script again	Johannes Schindelin	2016-10-07	1	-10/+20
* \|	pull: drop confusing prefix parameter of die_on_unclean_work_tree()	Johannes Schindelin	2016-10-07	1	-8/+8
* \|	Merge branch 'va/i18n-even-more'	Junio C Hamano	2016-07-13	1	-1/+1
\|\ \
\| * \|	i18n: advice: internationalize message for conflicts	Vasco Almeida	2016-06-17	1	-1/+1
* \| \|	pull: warn on --verify-signatures with --rebaseah/no-verify-signature-with-pull-rebase	Alexander Hirsch	2016-05-20	1	-0/+3
\|/ /
* \|	Merge branch 'va/i18n-misc-updates'	Junio C Hamano	2016-05-17	1	-7/+7
\|\ \
\| * \|	i18n: builtin/pull.c: split strings marked for translation	Vasco Almeida	2016-04-19	1	-4/+4
\| * \|	i18n: builtin/pull.c: mark placeholders for translation	Vasco Almeida	2016-04-19	1	-3/+3
* \| \|	Merge branch 'jc/merge-refuse-new-root'	Junio C Hamano	2016-04-29	1	-0/+6
\|\ \ \
\| * \| \|	pull: pass --allow-unrelated-histories to "git merge"jc/merge-refuse-new-root	Junio C Hamano	2016-04-21	1	-0/+6
* \| \| \|	pull --rebase: add --[no-]autostash flag	Mehul Jain	2016-03-21	1	-0/+12
* \| \| \|	git-pull.c: introduce git_pull_config()	Mehul Jain	2016-03-21	1	-3/+15
\| \|/ / \|/\| \|
* \| \|	Merge branch 'jc/strbuf-getline'	Junio C Hamano	2016-01-28	1	-1/+1
\|\ \ \
\| * \| \|	strbuf: introduce strbuf_getline_{lf,nul}()	Junio C Hamano	2016-01-15	1	-1/+1
\| \|/ /
* \| \|	Merge branch 'js/pull-rebase-i'	Junio C Hamano	2016-01-26	1	-2/+7
\|\ \ \
\| * \| \|	pull: allow interactive rebase with --rebase=interactive	Johannes Schindelin	2016-01-13	1	-2/+7
\| \|/ /
* \| \|	submodules: allow parallel fetching, add tests and documentation	Stefan Beller	2015-12-16	1	-0/+6
\|/ /
* \|	Remove get_object_hash.	brian m. carlson	2015-11-20	1	-1/+1
* \|	Convert struct object to object_id	brian m. carlson	2015-11-20	1	-1/+1
\|/
*	Merge branch 'pt/pull-builtin' into maint	Junio C Hamano	2015-10-16	1	-1/+1
\|\
\| *	pull: enclose <options> in brackets in the usage stringpt/pull-builtin	Alex Henrie	2015-10-16	1	-1/+1
* \|	pull: don't mark values for option "rebase" for translation	Ralf Thielow	2015-09-11	1	-1/+1
* \|	Merge branch 'mh/tempfile'	Junio C Hamano	2015-08-25	1	-0/+1
* \|	pull: allow dirty tree when rebase.autostash enabledkd/pull-rebase-autostash	Kevin Daudt	2015-07-22	1	-1/+5
\|/
*	pull: remove redirection to git-pull.sh	Paul Tan	2015-06-18	1	-7/+0
*	pull --rebase: error on no merge candidate cases	Paul Tan	2015-06-18	1	-3/+12
*	pull --rebase: exit early when the working directory is dirty	Paul Tan	2015-06-18	1	-1/+76
*	pull: configure --rebase via branch.<name>.rebase or pull.rebase	Paul Tan	2015-06-18	1	-1/+34
*	pull: teach git pull about --rebase	Paul Tan	2015-06-18	1	-2/+245