?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
Allow git-merge to select the default strategy.
2006-12-24 Johannes Schindelincommit-tree: encourage UTF-8 commit messages.
 commit | commitdiff | tree
2006-12-22 Johannes SchindelinMake git-rerere a builtin
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-12-22 Johannes SchindelinAdd a test for git-rerere
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-12-22 Johannes Schindelinmove read_mmfile() into xdiff-interface
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-12-22 Johannes Schindelingit-reset --hard: tell the user what the HEAD was reset to
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-12-22 Johannes Schindelingit-tag: support -F <file> option
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-12-22 Johannes SchindelinUse git-merge-file in git-merge-one-file, too
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-12-22 Johannes Schindelindiff --check: fix off by one error
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-12-19 Johannes SchindelinIntroduce GIT_TEMPLATE_DIR
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-12-16 Johannes Schindelingit-branch: rename config vars branch.<branch>.*, too
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-12-16 Johannes Schindelinadd a function to rename sections in the config
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-12-16 Johannes SchindelinDocument git-merge-file
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-12-14 Johannes Schindelingit-show: grok blobs, trees and tags, too
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-12-14 Johannes SchindelinINSTALL: no need to have GNU diff installed
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-12-13 Johannes Schindelinmerge-recursive: add/add really is modify/modify with...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-12-13 Johannes SchindelinGet rid of the dependency on RCS' merge program
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-12-06 Johannes Schindelinmerge-file: support -p and -q; fix compile warnings
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-12-06 Johannes SchindelinAdd builtin merge-file, a minimal replacement for RCS...
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-12-06 Johannes Schindelincvs-migration document: make the need for "push" more...
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-12-05 Johannes Schindelinxdl_merge(): fix and simplify conflict handling
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-12-05 Johannes Schindelindiff -b: ignore whitespace at end of line
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-12-04 Johannes Schindelingit-mv: search more precisely for source directory...
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-12-03 Johannes Schindelinxdl_merge(): fix thinko
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-12-03 Johannes Schindelinxdl_merge(): fix an off-by-one bug
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-12-03 Johannes Schindelinxdiff: add xdl_merge()
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-11-28 Johannes Schindelinsha1_object_info(): be consistent with read_sha1_file()
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-11-28 Johannes Schindelinshortlog: use pager
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-11-21 Johannes Schindelinshortlog: fix "-n"
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-11-20 Johannes Schindelinshortlog: handle email addresses case-insensitively
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-11-20 Johannes Schindelinshortlog: read mailmap from ./.mailmap again
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-11-20 Johannes Schindelinshortlog: do not crash on parsing "[PATCH"
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-11-20 Johannes SchindelinBuild in shortlog
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-11-15 Johannes SchindelinSeek back to current filepos when mmap()ing with NO_MMAP
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-11-03 Johannes Schindelinlink_temp_to_file: call adjust_shared_perm() only when...
commit | commitdiff | tree
2006-10-15 Johannes Schindelincvsserver: fix "cvs diff" in a subdirectory
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-10-15 Johannes Schindelincvsserver: Show correct letters for modified, removed...
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-10-12 Johannes Schindelindiff: fix 2 whitespace issues
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-10-05 Johannes SchindelinTurn on recursive with --summary
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-09-29 Johannes Schindelindiff --stat: ensure at least one '-' for deletions...
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-09-28 Johannes Schindelindaemon: default to 256 for HOST_NAME_MAX if it is not...
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-09-28 Johannes Schindelinrunstatus: do not recurse into subdirectories if not...
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-09-22 Johannes Schindelinshow-branch: mark active branch with a '*' again
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-09-22 Johannes SchindelinFix git-update-index --again
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-09-21 Johannes SchindelinDocument receive.denyNonFastforwards
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-09-21 Johannes Schindelinreceive-pack: plug memory leak in fast-forward checking...
commit | commitdiff | tree
2006-09-20 Johannes Schindelinadd receive.denyNonFastforwards config variable
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-09-13 Johannes SchindelinTeach runstatus about --untracked
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-09-01 Johannes Schindelinfmt-merge-msg: fix off-by-one bug
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-08-29 Johannes SchindelinRemove uneeded #include
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-08-29 Johannes SchindelinMakefile: fix typo
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-08-29 Johannes Schindelinunpack-objects: remove unused variable "eof"
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-08-21 Johannes Schindelinbuiltin-mv: readability patch
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-08-21 Johannes Schindelingit-mv: fix off-by-one error
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-08-21 Johannes Schindelingit-mv: special case destination "."
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-08-21 Johannes Schindelinbuiltin-mv: readability patch
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-08-16 Johannes Schindelin[PATCH] git-mv: add more path normalization
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-08-16 Johannes Schindelingit-mv: succeed even if source is a prefix of destination
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-08-10 Johannes SchindelinAdd the --color-words option to the diff options family
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-08-10 Johannes Schindelindiscard_cache(): discard index, even if no file was...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-08-09 Johannes Schindelinmerge-recur: do not die unnecessarily
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-08-09 Johannes Schindelinmerge-recur: try to merge older merge bases first
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-08-09 Johannes Schindelinmerge-recur: if there is no common ancestor, fake empty one
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-08-09 Johannes Schindelinmerge-recur: do not setenv("GIT_INDEX_FILE")
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-08-09 Johannes Schindelinmerge-recur: do not call git-write-tree
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-08-05 Johannes Schindelinhttp-push: avoid fork() by calling merge_bases() directly
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-08-04 Johannes Schindelinmerge-recursive: fix rename handling
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-08-04 Johannes SchindelinFix crash when GIT_DIR is invalid
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-31 Johannes Schindelinmerge-recur: virtual commits shall never be parsed
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-31 Johannes Schindelinmerge-recur: use the unpack_trees() interface instead...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-31 Johannes Schindelinread-tree: move merge functions to the library
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-31 Johannes Schindelinread-trees: refactor the unpack_trees() part
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-31 Johannes Schindelintar-tree: illustrate an obscure feature better
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-30 Johannes Schindelinmerge-recur: fix thinko in unique_path()
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-29 Johannes SchindelinFix http-fetch
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-28 Johannes SchindelinTeach git-apply about '-R'
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-28 Johannes SchindelinMakefile: ssh-pull.o depends on ssh-fetch.c
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-28 Johannes Schindelinmerge-recur: Explain why sha_eq() and struct stage_data...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-28 Johannes Schindelinmerge-recur: Cleanup last mixedCase variables...
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-28 Johannes Schindelinmerge-recur: Fix compiler warning with -pedantic
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-28 Johannes Schindelinmerge-recur: Remove dead code
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-28 Johannes Schindelinmerge-recur: Get rid of debug code
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-28 Johannes Schindelinmerge-recur: Convert variable names to lower_case
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-28 Johannes SchindelinCumulative update of merge-recursive in C
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-26 Johannes Schindelincvsserver: imitate git-update-ref when committing
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-26 Johannes Schindelininstaweb: Be more clear if httpd or the browser fail
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-26 Johannes Schindelinbuiltin git-mv: support moving directories
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-26 Johannes SchindelinMake git-mv a builtin
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-26 Johannes SchindelinExtract helper bits from c-merge-recursive work
 commit | commitdiff | tree
2006-07-26 Johannes Schindelingit-cvsserver: support multiline commit messages
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-26 Johannes Schindelint7001: add test for git-mv dir1 dir2/
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-26 Johannes Schindelingitweb: fix two warnings
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-26 Johannes Schindelingit-instaweb: respect bindir from Makefile
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-26 Johannes Schindelingit-instaweb: some Apache have mod_cgi builtin
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-25 Johannes Schindelingit wrapper: add --git-dir=<path> and --bare options
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-25 Johannes SchindelinAllow an alias to start with "-p"
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-25 Johannes Schindelincvsserver: avoid warning about active db handles
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-25 Johannes Schindelincvsserver: suppress warnings
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-24 Johannes SchindelinAlways reset the color _before_ printing out the newline
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-24 Johannes SchindelinFix t4114 on cygwin
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-14 Johannes SchindelinStatus update on merge-recursive in C
 commit | commitdiff | tree
next
The Best VCS Around