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

	Commit message (Expand)	Author	Age	Files	Lines
*	Do not ignore merge options in interactive rebaseaf/rebase-i-merge-options	Arnaud Fontaine	2013-07-02	2	-5/+27
*	Update draft release notes to 1.8.4	Junio C Hamano	2013-06-24	1	-4/+14
*	Merge branch 'rr/am-quit-empty-then-abort-fix'	Junio C Hamano	2013-06-24	2	-17/+40
\|\
\| *	t/am: use test_path_is_missing() where appropriate	Ramkumar Ramachandra	2013-06-17	1	-17/+17
\| *	am: handle stray $dotest directory	Ramkumar Ramachandra	2013-06-17	2	-0/+23
* \|	Merge branch 'rt/cherry-pick-continue-advice-in-status'	Junio C Hamano	2013-06-24	2	-4/+8
\|\ \
\| * \|	wt-status: give better advice when cherry-pick is in progress	Ralf Thielow	2013-06-17	2	-4/+8
* \| \|	Merge branch 'nk/config-local-doc'	Junio C Hamano	2013-06-24	1	-0/+9
\|\ \ \
\| * \| \|	config: Add description of --local option	Namhyung Kim	2013-06-17	1	-0/+9
* \| \| \|	Merge branch 'jk/mergetool-lib-refactor'	Junio C Hamano	2013-06-24	1	-47/+35
\|\ \ \ \
\| * \| \| \|	mergetool--lib: refactor {diff,merge}_cmd logic	John Keeping	2013-06-17	1	-47/+35
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'jk/doc-build-move-infordir-def'	Junio C Hamano	2013-06-24	1	-22/+22
\|\ \ \ \
\| * \| \| \|	Documentation/Makefile: move infodir to be with other '*dir's	John Keeping	2013-06-17	1	-1/+1
\| * \| \| \|	Documentation/Makefile: fix spaces around assignments	John Keeping	2013-06-17	1	-21/+21
* \| \| \| \|	Merge branch 'fg/submodule-fixup'	Junio C Hamano	2013-06-24	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	git-submodule.sh: remove duplicate call to set_rev_name	Fredrik Gustafsson	2013-06-17	1	-2/+2
* \| \| \| \| \|	Merge branch 'dk/version-gen-gitdir'	Junio C Hamano	2013-06-24	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	GIT-VERSION-GEN: support non-standard $GIT_DIR path	Dennis Kaarsemaker	2013-06-17	1	-1/+1
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'dk/maint-t5150-dirname'	Junio C Hamano	2013-06-24	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	tests: allow sha1's as part of the path	Dennis Kaarsemaker	2013-06-17	1	-1/+1
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'rs/unpack-trees-tree-walk-conflict-field'	Junio C Hamano	2013-06-24	2	-16/+4
\|\ \ \ \ \ \
\| * \| \| \| \| \|	unpack-trees: don't shift conflicts left and right	René Scharfe	2013-06-17	2	-16/+4
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'rr/rebase-sha1-by-string-query'	Junio C Hamano	2013-06-24	4	-2/+36
\|\ \ \ \ \ \
\| * \| \| \| \| \|	rebase: use peel_committish() where appropriate	Ramkumar Ramachandra	2013-06-14	3	-4/+4
\| * \| \| \| \| \|	sh-setup: add new peel_committish() helper	Ramkumar Ramachandra	2013-06-14	1	-0/+12
\| * \| \| \| \| \|	t/rebase: add failing tests for a peculiar revision	Ramkumar Ramachandra	2013-06-14	2	-0/+22
* \| \| \| \| \| \|	Merge branch 'mm/rm-coalesce-errors'	Junio C Hamano	2013-06-24	5	-19/+184
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	rm: introduce advice.rmHints to shorten messages	Mathieu Lienard--Mayor	2013-06-12	5	-1/+37
\| * \| \| \| \| \| \|	rm: better error message on failure for multiple files	Mathieu Lienard--Mayor	2013-06-12	2	-19/+148
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'jh/libify-note-handling'	Junio C Hamano	2013-06-24	8	-189/+203
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Move create_notes_commit() from notes-merge.c into notes-utils.c	Johan Herland	2013-06-12	4	-41/+41
\| * \| \| \| \| \| \|	Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c	Johan Herland	2013-06-12	6	-146/+159
\| * \| \| \| \| \| \|	finish_copy_notes_for_rewrite(): Let caller provide commit message	Johan Herland	2013-06-12	3	-6/+7
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'fc/sequencer-plug-leak'	Junio C Hamano	2013-06-24	1	-7/+11
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	sequencer: avoid leaking message buffer when refusing to create an empty commit	Felipe Contreras	2013-06-06	1	-2/+4
\| * \| \| \| \| \| \|	sequencer: remove useless indentation	Felipe Contreras	2013-06-03	1	-7/+9
\| \|/ / / / / /
* \| \| \| \| \| \|	Revert "Merge branch 'jg/status-config'"	Junio C Hamano	2013-06-24	3	-76/+0
* \| \| \| \| \| \|	Update draft release notes to 1.8.4	Junio C Hamano	2013-06-23	1	-0/+4
* \| \| \| \| \| \|	Merge branch 'mz/rebase-tests'	Junio C Hamano	2013-06-23	8	-203/+673
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	rebase topology tests: fix commit names on case-insensitive file systems	Johannes Sixt	2013-06-18	2	-18/+18
\| * \| \| \| \| \| \|	tests: move test for rebase messages from t3400 to t3406	Martin von Zweigbergk	2013-06-07	2	-22/+22
\| * \| \| \| \| \| \|	t3406: modernize style	Martin von Zweigbergk	2013-06-07	1	-21/+9
\| * \| \| \| \| \| \|	add tests for rebasing merged history	Martin von Zweigbergk	2013-06-07	5	-137/+260
\| * \| \| \| \| \| \|	add tests for rebasing root	Martin von Zweigbergk	2013-06-07	1	-0/+129
\| * \| \| \| \| \| \|	add tests for rebasing of empty commits	Martin von Zweigbergk	2013-06-07	2	-24/+58
\| * \| \| \| \| \| \|	add tests for rebasing with patch-equivalence present	Martin von Zweigbergk	2013-06-07	2	-0/+102
\| * \| \| \| \| \| \|	add simple tests of consistency across rebase types	Martin von Zweigbergk	2013-06-07	2	-0/+94
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'jk/unpack-entry-fallback-to-another'	Junio C Hamano	2013-06-23	2	-2/+38
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	unpack_entry: do not die when we fail to apply a delta	Jeff King	2013-06-14	2	-1/+37
\| * \| \| \| \| \| \|	t5303: drop "count=1" from corruption dd	Jeff King	2013-06-14	1	-1/+1
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|