?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
merge-recur: do not die unnecessarily
2006-08-09 Johannes Schindelinmerge-recur: do not die unnecessarily
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-08-09 Johannes Schindelinmerge-recur: try to merge older merge bases first
 ...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
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-08-09 Johannes Schindelinmerge-recur: do not setenv("GIT_INDEX_FILE")
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-08-09 Johannes Schindelinmerge-recur: do not call git-write-tree
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-08-04 Johannes Schindelinmerge-recursive: fix rename handling
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-31 Johannes Schindelinmerge-recur: virtual commits shall never be parsed
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-31 Johannes Schindelinmerge-recur: use the unpack_trees() interface instead...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-31 Johannes Schindelinread-tree: move merge functions to the library
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-31 Johannes Schindelinread-trees: refactor the unpack_trees() part
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-31 Johannes Schindelintar-tree: illustrate an obscure feature better
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-30 Johannes Schindelinmerge-recur: fix thinko in unique_path()
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-29 Johannes SchindelinFix http-fetch
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-28 Johannes SchindelinTeach git-apply about '-R'
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-28 Johannes SchindelinMakefile: ssh-pull.o depends on ssh-fetch.c
 ...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...
...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-28 Johannes Schindelinmerge-recur: Cleanup last mixedCase variables...
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-28 Johannes Schindelinmerge-recur: Fix compiler warning with -pedantic
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-28 Johannes Schindelinmerge-recur: Remove dead code
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-28 Johannes Schindelinmerge-recur: Get rid of debug code
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-28 Johannes Schindelinmerge-recur: Convert variable names to lower_case
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-28 Johannes SchindelinCumulative update of merge-recursive in C
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-26 Johannes Schindelincvsserver: imitate git-update-ref when committing
 ...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
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-26 Johannes Schindelinbuiltin git-mv: support moving directories
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-26 Johannes SchindelinMake git-mv a builtin
 ...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
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-26 Johannes Schindelint7001: add test for git-mv dir1 dir2/
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-26 Johannes Schindelingitweb: fix two warnings
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-26 Johannes Schindelingit-instaweb: respect bindir from Makefile
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-26 Johannes Schindelingit-instaweb: some Apache have mod_cgi builtin
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-25 Johannes Schindelingit wrapper: add --git-dir=<path> and --bare options
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-25 Johannes SchindelinAllow an alias to start with "-p"
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-25 Johannes Schindelincvsserver: avoid warning about active db handles
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-25 Johannes Schindelincvsserver: suppress warnings
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-24 Johannes SchindelinAlways reset the color _before_ printing out the newline
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-24 Johannes SchindelinFix t4114 on cygwin
 ...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
2006-07-10 Johannes SchindelinFix linking for not-so-clever linkers.
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-08 Johannes SchindelinClose the index file between writing and committing
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-07 Johannes SchindelinMakefile: export NO_SVN_TESTS
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-04 Johannes SchindelinMake git-fmt-merge-msg a builtin
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-07-02 Johannes SchindelinMakefile: replace ugly and unportable sed invocation
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-06-29 Johannes Schindelinmove get_merge_bases() to core lib.
 commit | commitdiff | tree
2006-06-29 Johannes Schindelinrefactor merge_bases() as preparation to libify merge...
commit | commitdiff | tree
2006-06-28 Johannes SchindelinSave errno in handle_alias()
 ...off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
 commit | commitdiff | tree
2006-06-27 Johannes Schindelinformat-patch: use clear_commit_marks() instead of some...
...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-06-27 Johannes Schindelint4014: fix for whitespace from "wc -l"
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-06-26 Johannes Schindelinformat-patch: introduce "--ignore-if-in-upstream"
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-06-26 Johannes Schindelinadd diff_flush_patch_id() to calculate the patch id
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-06-25 Johannes Schindelinapply: replace NO_ACCURATE_DIFF with --inaccurate-eof...
...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-06-25 Johannes Schindelincvsimport: always set $ENV{GIT_INDEX_FILE} to $index...
...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-06-24 Johannes SchindelinTeach diff about -b and -w flags
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-06-23 Johannes Schindelinpatch-id: take "commit" prefix as well as "diff-tree...
...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-06-20 Johannes Schindelingit_config: access() returns 0 on success, not > 0
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-06-20 Johannes Schindelinrepo-config: Fix late-night bug
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-06-20 Johannes SchindelinRead configuration also from $HOME/.gitconfig
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-06-20 Johannes SchindelinFix setting config variables with an alternative GIT_CONFIG
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-06-20 Johannes SchindelinInitialize lock_file struct to all zero.
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-06-18 Johannes Schindelindiff options: add --color
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-06-06 Johannes SchindelinIf you have a config containing something like this:
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-06-02 Johannes Schindelinformat-patch: resurrect extra headers from config
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-05-31 Johannes Schindelinsend-email: only 'require' instead of 'use' Net::SMTP
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-05-26 Johannes Schindelingit-format-patch --start-number <n>
 commit | commitdiff | tree
2006-05-21 Johannes Schindelinfmt-patch: Support --attach
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-05-21 Johannes Schindelindiff family: add --check option
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-05-07 Johannes SchindelinFix crash when reading the empty tree
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-05-07 Johannes SchindelinFix users of prefix_path() to free() only when necessary
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-05-07 Johannes SchindelinFix users of prefix_path() to free() only when necessary
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-05-06 Johannes Schindelinfmt-patch: understand old <his> notation
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-05-05 Johannes Schindelinrepo-config: trim white-space before comment
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-05-05 Johannes SchindelinTeach fmt-patch about --keep-subject
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-05-05 Johannes SchindelinTeach fmt-patch about --numbered
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-05-05 Johannes Schindelinfmt-patch: implement -o <dir>
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-05-05 Johannes Schindelinfmt-patch: output file names to stdout
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-05-05 Johannes SchindelinTeach fmt-patch to write individual files.
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-05-05 Johannes Schindelinbuiltin-push: --all and --tags _are_ explicit refspecs
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-05-04 Johannes SchindelinAdd a conversion tool to migrate remote information...
...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-05-04 Johannes Schindelinfetch, pull: ask config for remote information
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-05-03 Johannes Schindelinrepo-config: deconvolute logics
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-05-03 Johannes Schindelinrepo-config: support --get-regexp
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-05-02 Johannes Schindelinrepo-config: trim white-space before comment
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-05-02 Johannes Schindelinrepo-config: fix segfault with no argument.
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-05-02 Johannes Schindelinfetch, pull: ask config for remote information
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-05-02 Johannes Schindelinbuiltin-push: also ask config for remote information
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-05-02 Johannes Schindelincache-tree: replace a sscanf() by two strtol() calls
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-04-30 Johannes Schindelinbuiltin-push: resurrect parsing of Push: lines
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-04-16 Johannes Schindelinpager: do not fork a pager if PAGER is set to empty.
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-04-16 Johannes Schindelindiff-options: add --patch-with-stat
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-04-13 Johannes Schindelindiff-options: add --stat (take 2)
 commit | commitdiff | tree
2006-04-13 Johannes Schindelindiff-options: add --stat (take 2)
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-04-05 Johannes SchindelinFix compile with expat, but an old curl version
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-04-05 Johannes SchindelinOn some platforms, certain headers need to be included...
...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-04-05 Johannes Schindelincvsimport: use git-update-ref when updating
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-03-27 Johannes SchindelinRemove dependency on a file named "-lz"
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-03-12 Johannes Schindelinimap-send: Add missing #include for macosx
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-03-03 Johannes SchindelinFix test case for some sed
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-03-01 Johannes SchindelinWarn about invalid refs
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
2006-02-22 Johannes SchindelinUse Ryan's git-annotate instead of jsannotate
 ...off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
 commit | commitdiff | tree
next
The Best VCS Around