summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2006-06-28Improved three-way blob merging codeLibravatar Linus Torvalds3-1/+240
2006-06-28Prepare "git-merge-tree" for future workLibravatar Linus Torvalds1-15/+119
2006-06-28xdiff: generate "anti-diffs" aka what is common to two filesLibravatar Linus Torvalds2-0/+19
2006-06-28checkout -m: fix read-tree invocationLibravatar Junio C Hamano2-2/+73
2006-06-28t/README: start testing porcelainishLibravatar Junio C Hamano1-0/+1
2006-06-28Save errno in handle_alias()Libravatar Johannes Schindelin1-1/+3
2006-06-28rebase: check for errors from git-commitLibravatar Eric Wong1-1/+6
2006-06-28cvsimport - cleanup of the multi-indexes handlingLibravatar Martin Langhoff1-38/+24
2006-06-28connect.c: check the commit buffer boundary while parsing.Libravatar Junio C Hamano1-4/+8
2006-06-28connect.c: remove unused parameters from tcp_connect and proxy_connectLibravatar Junio C Hamano1-6/+4
2006-06-28Make some strings constLibravatar Timo Hirvonen11-15/+16
2006-06-28rebase: get rid of outdated MRESOLVEMSGLibravatar Eric Wong1-8/+3
2006-06-28git wrapper: fix command name in an error message.Libravatar Andreas Ericsson1-2/+1
2006-06-28git-svn: be verbose by default on fetch/commit, add -q/--quiet optionLibravatar Eric Wong1-11/+23
2006-06-28git-svn: add --follow-parent and --no-metadata options to fetchLibravatar Eric Wong2-46/+167
2006-06-28git-svn: add the commit-diff commandLibravatar Eric Wong2-19/+112
2006-06-28git-svn: several graft-branches improvementsLibravatar Eric Wong2-13/+230
2006-06-28git-svn: SVN 1.1.x library compatibilityLibravatar Eric Wong4-12/+44
2006-06-28combine-diff.c: type sanityLibravatar Junio C Hamano1-14/+15
2006-06-28quote.c: silence compiler warnings from EMIT macroLibravatar Jeff King1-1/+1
2006-06-27Fix expr usage for FreeBSDLibravatar Dennis Stosberg7-16/+16
2006-06-26Merge branch 'jc/squash'Libravatar Junio C Hamano5-24/+72
2006-06-26Merge branch 'jc/diff'Libravatar Junio C Hamano2-15/+80
2006-06-26Merge branch 'ml/cvsimport'Libravatar Junio C Hamano1-17/+23
2006-06-26Merge branch 'js/diff'Libravatar Junio C Hamano9-20/+81
2006-06-26Merge branch 'ew/rebase'Libravatar Junio C Hamano4-24/+90
2006-06-26Fix pkt-line.h to compile with a non-GCC compilerLibravatar Dennis Stosberg1-0/+2
2006-06-26Solaris needs inclusion of signal.h for signal()Libravatar Dennis Stosberg2-0/+2
2006-06-25correct documentation for git grepLibravatar Matthias Lederhofer1-1/+6
2006-06-25diff --color: use $GIT_DIR/configLibravatar Junio C Hamano2-15/+80
2006-06-25rebase: allow --skip to work with --mergeLibravatar Eric Wong3-2/+73
2006-06-25rebase: cleanup rebasing with --mergeLibravatar Eric Wong1-28/+5
2006-06-25rebase: allow --merge option to handle patches merged upstreamLibravatar Eric Wong2-5/+23
2006-06-25git-commit: filter out log message lines only when editor was run.Libravatar Yann Dirson1-7/+12
2006-06-24Rename safe_strncpy() to strlcpy().Libravatar Peter Eriksen12-30/+48
2006-06-24apply: replace NO_ACCURATE_DIFF with --inaccurate-eof runtime flag.Libravatar Johannes Schindelin1-9/+16
2006-06-24Clean up diff.cLibravatar Timo Hirvonen1-12/+6
2006-06-24cvsimport: always set $ENV{GIT_INDEX_FILE} to $index{$branch}Libravatar Johannes Schindelin1-7/+8
2006-06-24cvsimport: setup indexes correctly for ancestors and incremental importsLibravatar Martin Langhoff1-17/+22
2006-06-24repo-config: fix printing of boolLibravatar Junio C Hamano1-6/+3
2006-06-24diff --color: use reset sequence when we mean reset.Libravatar Junio C Hamano1-1/+1
2006-06-24git-repack -- respect -q and be quietLibravatar Martin Langhoff1-2/+3
2006-06-24git-merge --squashLibravatar Junio C Hamano5-24/+72
2006-06-24git-pull: abort when fmt-merge-msg fails.Libravatar Junio C Hamano1-1/+1
2006-06-24Merge branch 'pb/error'Libravatar Junio C Hamano5-6/+52
2006-06-24usage: minimum type fix.Libravatar Junio C Hamano1-3/+3
2006-06-24Customizable error handlersLibravatar Petr Baudis2-4/+46
2006-06-23git-merge: Don't use -p when outputting summaryLibravatar Timo Hirvonen1-1/+1
2006-06-23Teach diff about -b and -w flagsLibravatar Johannes Schindelin9-20/+81
2006-06-23git-commit: allow -e option anywhere on command lineLibravatar Jeff King1-1/+3