Public Git Hosting - git/mergetool.git/search

2007-07-24	Johannes Schindelin	filter-branch: Big syntax change; support rewriting... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-24	Johannes Schindelin	rebase -i: exchange all "if [ .. ]" by "if test .." Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-24	Johannes Schindelin	Shut "git rebase -i" up when no --verbose was given Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-24	Johannes Schindelin	mailinfo: fix 'fatal: cannot convert from utf-8 to... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-22	Johannes Schindelin	fsck --lost-found: write blob's contents, not their... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-21	Johannes Schindelin	rebase -i: call editor just once for a multi-squash Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-19	Johannes Schindelin	filter-branch: get rid of "set -e" Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-11	Johannes Schindelin	branch --track: code cleanup and saner handling of... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-11	Johannes Schindelin	Add for_each_remote() function, and extend remote_find_track... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-11	Johannes Schindelin	Fix --cherry-pick with given paths Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-11	Johannes Schindelin	Fix core.sharedRepository = 2 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-10	Johannes Schindelin	rerere: record resolution even if file is not in merge... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-09	Johannes Schindelin	rebase -i: put a nice warning into the todo list Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-09	Johannes Schindelin	rebase -i: remember the settings of -v, -s and -p when... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-09	Johannes Schindelin	rebase -i: actually show the diffstat when being verbose Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-09	Johannes Schindelin	rebase -i: handle --continue more like non-interactive... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-09	Johannes Schindelin	branch.autosetupmerge: allow boolean values, or "all" Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-07	Johannes Schindelin	Fix "apply --reverse" with regard to whitespace Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-07	Johannes Schindelin	git-branch: default to --track Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-07	Johannes Schindelin	Enable "git rerere" by the config variable rerere.enabled Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-06	Johannes Schindelin	Teach git-stash to "apply --index" Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-06	Johannes Schindelin	Future-proof source for changes in xdemitconf_t Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-06	Johannes Schindelin	filter-branch: fail gracefully when a filter fails Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-06	Johannes Schindelin	filter-branch documentation: clarify which filters... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-04	Johannes Schindelin	filter-branch: a few more touch ups to the man page Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-04	Johannes Schindelin	filter-branch: make output nicer Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-04	Johannes Schindelin	filter-branch: add a test for the commit removal example Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-04	Johannes Schindelin	Add diff-option --ext-diff Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-04	Johannes Schindelin	Document git-filter-branch Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-03	Johannes Schindelin	glossary: add 'reflog' Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-03	Johannes Schindelin	diff --no-index: fix --name-status with added files Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-03	Johannes Schindelin	git-fsck: add --lost-found option Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-02	Johannes Schindelin	Make '!' aliases more useful Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-01	Johannes Schindelin	git add: respect core.filemode with unmerged entries Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-07-01	Johannes Schindelin	t7004: ship trustdb to avoid gpg warnings	commit \| commitdiff \| tree
2007-06-27	Johannes Schindelin	Teach rebase -i about --preserve-merges Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-06-27	Johannes Schindelin	rebase -i: provide reasonable reflog for the rebased... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-06-27	Johannes Schindelin	rebase -i: several cleanups Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-06-25	Johannes Schindelin	Teach rebase an interactive mode Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-06-25	Johannes Schindelin	Move the pick_author code to git-sh-setup Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-06-23	Johannes Schindelin	filter-branch: add example to move everything into... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-06-23	Johannes Schindelin	diffcore-rename: favour identical basenames Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-06-17	Johannes Schindelin	pp_header(): work around possible memory corruption Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>	commit \| commitdiff \| tree
2007-06-16	Johannes Schindelin	merge-recursive: refuse to merge binary files Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-06-16	Johannes Schindelin	Move buffer_is_binary() to xdiff-interface.h Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-06-12	Johannes Schindelin	Teach diff to imply --find-copies-harder upon -C -C Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>	commit \| commitdiff \| tree
2007-06-09	Johannes Schindelin	Teach filter-branch about subdirectory filtering Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-06-06	Johannes Schindelin	t5000: skip ZIP tests if unzip was not found Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>	commit \| commitdiff \| tree
2007-06-06	Johannes Schindelin	filter-branch: fix behaviour of '-k' Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-06-06	Johannes Schindelin	filter-branch: use $(($i+1)) instead of $((i+1)) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-06-05	Johannes Schindelin	git-merge-file: refuse to merge binary files Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-06-05	Johannes Schindelin	merge-recursive: refuse to merge binary files Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-06-05	Johannes Schindelin	Move buffer_is_binary() to xdiff-interface.h Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-06-05	Johannes Schindelin	git-fsck: learn about --verbose Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-06-03	Johannes Schindelin	Add git-filter-branch Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-06-03	Johannes Schindelin	Update to SubmittingPatches Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-05-22	Johannes Schindelin	git-status: respect core.excludesFile Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-05-22	Johannes Schindelin	SubmittingPatches: mention older C compiler compatibility Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>	commit \| commitdiff \| tree
2007-05-17	Johannes Schindelin	Add a birdview-on-the-source-code section to the user... Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>	commit \| commitdiff \| tree
2007-05-16	Johannes Schindelin	import-tars: Use the "Link indicator" to identify directories Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-05-02	Johannes Schindelin	Teach import-tars about GNU tar's @LongLink extension. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-04-29	Johannes Schindelin	import-tars: be nice to wrong directory modes Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-04-24	Johannes Schindelin	t4201: Do not display weird characters on the terminal Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-04-23	Johannes Schindelin	dir.c(common_prefix): Fix two bugs Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-04-10	Johannes Schindelin	Use print_wrapped_text() in shortlog Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-28	Johannes Schindelin	t4118: be nice to non-GNU sed Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-24	Johannes Schindelin	git-revert: Revert revert message to old behaviour Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-23	Johannes Schindelin	t4118: be nice to non-GNU sed Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-20	Johannes Schindelin	Provide some technical documentation for shallow clones Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-20	Johannes Schindelin	Add a HOWTO for setting up a standalone git daemon Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-20	Johannes Schindelin	xdiff/xutils.c(xdl_hash_record): factor out whitespace... Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-14	Johannes Schindelin	Do not output "GEN " when generating perl.mak Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-12	Johannes Schindelin	git-bundle: only die if pack would be empty, warn if... Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-09	Johannes Schindelin	git-bundle: prevent overwriting existing bundles Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-09	Johannes Schindelin	git-bundle: die if a given ref is not included in bundle Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-09	Johannes Schindelin	git-bundle: handle thin packs in subcommand "unbundle" Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-08	Johannes Schindelin	git-bundle: Make thin packs Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-08	Johannes Schindelin	git-bundle: avoid packing objects which are in the... Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-07	Johannes Schindelin	bundle: fix wrong check of read_header()'s return value... Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-07	Johannes Schindelin	make t8001 work on Mac OS X again Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-05	Johannes Schindelin	Begin SubmittingPatches with a check list Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-05	Johannes Schindelin	format-patch: add --inline option and make --attach... Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-04	Johannes Schindelin	cherry-pick: Suggest a better method to retain authorship Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-04	Johannes Schindelin	Get rid of the dependency to GNU diff in the tests Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-04	Johannes Schindelin	diff --no-index: support /dev/null as filename Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-04	Johannes Schindelin	diff: support reading a file from stdin via "-" Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-04	Johannes Schindelin	Make git-revert & git-cherry-pick a builtin Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-04	Johannes Schindelin	Document the config variable format.suffix Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-03	Johannes Schindelin	builtin-archive: use RUN_SETUP Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-02	Johannes Schindelin	print_wrapped_text: fix output for negative indent Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-01	Johannes Schindelin	fetch.o depends on the headers, too. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>	commit \| commitdiff \| tree
2007-03-01	Johannes Schindelin	diff: make more cases implicit --no-index Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-02-28	Johannes Schindelin	show_date(): rename the "relative" parameter to "mode" Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-02-28	Johannes Schindelin	Actually make print_wrapped_text() useful Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-02-26	Johannes Schindelin	diff --no-index: also imitate the exit status of diff(1) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-02-25	Johannes Schindelin	Fix typo: do not show name1 when name2 fails Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-02-24	Johannes Schindelin	object name: introduce ':/<oneline prefix>' notation Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-02-24	Johannes Schindelin	Fixup no-progress for fetch & clone Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>	commit \| commitdiff \| tree
2007-02-23	Johannes Schindelin	git-bundle: record commit summary in the prerequisite...	commit \| commitdiff \| tree
2007-02-23	Johannes Schindelin	git-bundle: fix 'create --all'	commit \| commitdiff \| tree
next

Git mergetool

RSS Atom