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

	Commit message (Expand)	Author	Age
*	Merge branch 'pw/p4-submit-conflicts'	Junio C Hamano	2012-09-18
\|\
\| *	git-p4: add submit --conflict option and config varaiable	Pete Wyckoff	2012-09-16
\| *	git p4: add submit --prepare-p4-only option	Pete Wyckoff	2012-09-16
\| *	git p4: add submit --dry-run option	Pete Wyckoff	2012-09-16
\| *	git p4: revert deleted files after submit cancel	Pete Wyckoff	2012-09-16
\| *	git p4: test clean-up after failed submit, fix added files	Pete Wyckoff	2012-09-16
\| *	git p4: standardize submit cancel due to unchanged template	Pete Wyckoff	2012-09-16
\| *	git p4: move conflict prompt into run, add [q]uit input	Pete Wyckoff	2012-09-16
\| *	git p4: gracefully fail if some commits could not be applied	Pete Wyckoff	2012-09-16
\| *	git p4 test: remove bash-ism of combined export/assignment	Pete Wyckoff	2012-09-16
* \|	Merge branch 'mv/cherry-pick-s'	Junio C Hamano	2012-09-18
\|\ \
\| * \|	cherry-pick: don't forget -s on failure	Miklos Vajna	2012-09-14
* \| \|	Merge branch 'maint'	Junio C Hamano	2012-09-17
\|\ \ \
\| * \| \|	t/perf: add "trash directory" to .gitignore	Ramkumar Ramachandra	2012-09-17
\| * \| \|	Merge branch 'mz/cherry-pick-cmdline-order' into maint	Junio C Hamano	2012-09-14
\| \|\ \ \
\| * \ \ \	Sync with 1.7.11.7	Junio C Hamano	2012-09-14
\| \|\ \ \ \
\| \| * \ \ \	Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11	Junio C Hamano	2012-09-14
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge branch 'rj/test-regex' into maint-1.7.11	Junio C Hamano	2012-09-14
\| \| \|\ \ \ \ \
\| * \| \ \ \ \ \	Merge branch 'maint-1.7.11' into maint	Junio C Hamano	2012-09-12
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / /
\| \| * \| \| \| \| \|	Merge branch 'jc/apply-binary-p0' into maint-1.7.11	Junio C Hamano	2012-09-12
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11	Junio C Hamano	2012-09-12
\| \| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge branch 'jk/maint-http-half-auth-push' into maint-1.7.11	Junio C Hamano	2012-09-12
\| \| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \	Merge branch 'kk/maint-for-each-ref-multi-sort' into maint-1.7.11	Junio C Hamano	2012-09-12
\| \| \|\ \ \ \ \ \ \ \ \
\| * \| \ \ \ \ \ \ \ \ \	Sync with 1.7.11.6	Junio C Hamano	2012-09-11
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'sz/submodule-force-update' into maint-1.7.11	Junio C Hamano	2012-09-11
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \	Merge branch 'ph/stash-rerere' into maint-1.7.11	Junio C Hamano	2012-09-11
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'hv/submodule-path-unmatch' into maint-1.7.11	Junio C Hamano	2012-09-11
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'mz/empty-rebase-test' into maint-1.7.11	Junio C Hamano	2012-09-11
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11	Junio C Hamano	2012-09-11
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'jc/maint-t7406-rev-parse-max-count-huh' into maint-1.7.11	Junio C Hamano	2012-09-11
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'jc/test-prereq' into maint	Junio C Hamano	2012-09-11
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'maint-1.7.11' into maint	Junio C Hamano	2012-09-10
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'bc/receive-pack-stdout-protection' into maint-1.7.11	Junio C Hamano	2012-09-10
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'jk/maint-null-in-trees' into maint-1.7.11	Junio C Hamano	2012-09-10
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'tr/maint-send-email-2047' into maint-1.7.11	Junio C Hamano	2012-09-10
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \| \| \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'mh/fetch-filter-refs'	Junio C Hamano	2012-09-17
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fetch-pack: eliminate spurious error messages	Michael Haggerty	2012-09-12
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fetch-pack: report missing refs even if no existing refs were received	Michael Haggerty	2012-09-12
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fetch_pack(): update sought->nr to reflect number of unique entries	Michael Haggerty	2012-09-12
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	t5500: add tests of fetch-pack --all --depth=N $URL $REF	Michael Haggerty	2012-09-12
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	t5500: add tests of error output for missing refs	Michael Haggerty	2012-09-12
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'mh/string-list'	Junio C Hamano	2012-09-17
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	string_list: add a function string_list_longest_prefix()	Michael Haggerty	2012-09-12
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	string_list: add a new function, string_list_remove_duplicates()	Michael Haggerty	2012-09-12
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	string_list: add a new function, filter_string_list()	Michael Haggerty	2012-09-12
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	string_list: add two new functions for splitting strings	Michael Haggerty	2012-09-12
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jc/maint-blame-no-such-path'	Junio C Hamano	2012-09-17
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	blame: allow "blame file" in the middle of a conflicted merge	Junio C Hamano	2012-09-11
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	blame $path: avoid getting fooled by case insensitive filesystems	Junio C Hamano	2012-09-10
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jc/ll-merge-binary-ours'	Junio C Hamano	2012-09-14
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \