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

	Commit message (Expand)	Author	Age
*	git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"	Johan Herland	2010-11-17
*	git notes merge: --commit should fail if underlying notes ref has moved	Johan Herland	2010-11-17
*	git notes merge: List conflicting notes in notes merge commit message	Johan Herland	2010-11-17
*	git notes merge: Manual conflict resolution, part 2/2	Johan Herland	2010-11-17
*	git notes merge: Manual conflict resolution, part 1/2	Johan Herland	2010-11-17
*	Documentation: Preliminary docs on 'git notes merge'	Johan Herland	2010-11-17
*	git notes merge: Add automatic conflict resolvers (ours, theirs, union)	Johan Herland	2010-11-17
*	git notes merge: Handle real, non-conflicting notes merges	Johan Herland	2010-11-17
*	builtin/notes.c: Refactor creation of notes commits.	Johan Herland	2010-11-17
*	git notes merge: Initial implementation handling trivial merges only	Johan Herland	2010-11-17
*	builtin/notes.c: Split notes ref DWIMmery into a separate function	Johan Herland	2010-11-17
*	notes.c: Use two newlines (instead of one) when concatenating notes	Johan Herland	2010-11-17
*	(trivial) t3303: Indent with tabs instead of spaces for consistency	Johan Herland	2010-11-17
*	notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond	Johan Herland	2010-11-17
*	notes.h/c: Allow combine_notes functions to remove notes	Johan Herland	2010-11-10
*	notes.c: Reorder functions in preparation for next commit	Johan Herland	2010-11-10
*	notes.h: Make default_notes_ref() available in notes API	Johan Herland	2010-11-10
*	(trivial) notes.h: Minor documentation fixes to copy_notes()	Johan Herland	2010-11-10
*	notes.c: Hexify SHA1 in die() message from init_notes()	Johan Herland	2010-11-10
*	notes: allow --dry-run for -n and --verbose for -v	René Scharfe	2010-08-09
*	Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -C	Matthieu Moy	2010-08-09
*	Documentation: cite git-am from git-apply	Brad King	2010-08-09
*	t7003: fix subdirectory-filter test	Thomas Rast	2010-08-09
*	Allow "check-ref-format --branch" from subdirectory	Jonathan Nieder	2010-08-06
*	check-ref-format: handle subcommands in separate functions	Jonathan Nieder	2010-08-06
*	pretty-options.txt: match --format's documentation with implementation.	Matthieu Moy	2010-08-05
*	Merge branch 'sv/maint-diff-q-clear-fix' into maint	Junio C Hamano	2010-08-03
\|\
\| *	Fix DIFF_QUEUE_CLEAR refactoring	Junio C Hamano	2010-08-02
* \|	Merge branch 'rr/svn-fe' into maint	Junio C Hamano	2010-08-03
\|\ \
\| * \|	contrib/svn-fe: Add the svn-fe target to .gitignore	Ramkumar Ramachandra	2010-08-03
\| * \|	contrib/svn-fe: Fix IncludePath	Ramkumar Ramachandra	2010-08-03
* \| \|	Merge branch 'pt/git-gui' into maint	Junio C Hamano	2010-08-03
\|\ \ \
\| * \ \	Merge git://repo.or.cz/git-gui into pt/git-gui	Junio C Hamano	2010-08-02
\| \|\ \ \
\| \| * \| \|	git-gui: fix size and position of window panes on startup	Pat Thoyts	2010-08-02
\| \| * \| \|	git-gui: mc cannot be used before msgcat has been loaded	Pat Thoyts	2010-08-02
\| \| * \| \|	git-gui: use textconv filter for diff and blame	Clément Poulain	2010-07-30
\| \| * \| \|	git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32	Pat Thoyts	2010-07-30
\| \| * \| \|	git-gui: fix shortcut creation on cygwin	Heiko Voigt	2010-07-30
\| \| * \| \|	git-gui: fix PATH environment for mingw development environment	Heiko Voigt	2010-07-30
\| \| * \| \|	git-gui: fix usage of _gitworktree when creating shortcut for windows	Heiko Voigt	2010-07-30
\| \| * \| \|	git-gui: fix "Explore Working Copy" for Windows again	Markus Heidelberg	2010-07-30
\| \| * \| \|	git-gui: fix usage of themed widgets variable	Heiko Voigt	2010-07-10
\| \| * \| \|	git-gui: Handle failure of core.worktree to identify the working directory.	Pat Thoyts	2010-07-10
\| \| * \| \|	Merge branch 'maint'	Shawn O. Pearce	2010-02-08
\| \| \|\ \ \
\| \| \| * \| \|	git-gui: check whether systems nice command works or disable it	Heiko Voigt	2010-02-08
* \| \| \| \| \|	Merge branch 'ab/tap' into maint	Junio C Hamano	2010-08-02
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	test-lib: Remove 3 year old no-op --no-python option	Ævar Arnfjörð Bjarmason	2010-08-02
\| * \| \| \| \|	test-lib: Ignore --quiet under a TAP harness	Ævar Arnfjörð Bjarmason	2010-08-02
* \| \| \| \| \|	Documentation/rev-parse: quoting is required with --parseopt	Thomas Rast	2010-08-02
* \| \| \| \| \|	Documentation: reporting bugs	Junio C Hamano	2010-08-02