summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2006-06-26Merge branch 'jc/squash'Junio C Hamano
2006-06-26Merge branch 'jc/diff'Junio C Hamano
2006-06-26Merge branch 'ml/cvsimport'Junio C Hamano
2006-06-26Merge branch 'js/diff'Junio C Hamano
2006-06-26Merge branch 'ew/rebase'Junio C Hamano
2006-06-26Fix pkt-line.h to compile with a non-GCC compilerDennis Stosberg
2006-06-26Solaris needs inclusion of signal.h for signal()Dennis Stosberg
2006-06-25correct documentation for git grepMatthias Lederhofer
2006-06-25diff --color: use $GIT_DIR/configJunio C Hamano
2006-06-25rebase: allow --skip to work with --mergeEric Wong
2006-06-25rebase: cleanup rebasing with --mergeEric Wong
2006-06-25rebase: allow --merge option to handle patches merged upstreamEric Wong
2006-06-25git-commit: filter out log message lines only when editor was run.Yann Dirson
2006-06-25Rename safe_strncpy() to strlcpy().Peter Eriksen
2006-06-25apply: replace NO_ACCURATE_DIFF with --inaccurate-eof runtime flag.Johannes Schindelin
2006-06-25Clean up diff.cTimo Hirvonen
2006-06-25cvsimport: always set $ENV{GIT_INDEX_FILE} to $index{$branch}Johannes Schindelin
2006-06-24cvsimport: setup indexes correctly for ancestors and incremental importsMartin Langhoff
2006-06-24repo-config: fix printing of boolJunio C Hamano
2006-06-24diff --color: use reset sequence when we mean reset.Junio C Hamano
2006-06-24git-repack -- respect -q and be quietMartin Langhoff
2006-06-24git-merge --squashJunio C Hamano
2006-06-24git-pull: abort when fmt-merge-msg fails.Junio C Hamano
2006-06-24Merge branch 'pb/error'Junio C Hamano
2006-06-24usage: minimum type fix.Junio C Hamano
2006-06-24Customizable error handlersPetr Baudis
2006-06-24git-merge: Don't use -p when outputting summaryTimo Hirvonen
2006-06-24Teach diff about -b and -w flagsJohannes Schindelin
2006-06-23git-commit: allow -e option anywhere on command lineJeff King
2006-06-23patch-id: take "commit" prefix as well as "diff-tree" prefixJohannes Schindelin
2006-06-22Makefile: do not recompile main programs when libraries have changed.Junio C Hamano
2006-06-22add GIT-CFLAGS to .gitignoreMatthias Kestenholz
2006-06-22Tweak diff colorsLinus Torvalds
2006-06-22Merge branch 'master' into nextv1.4.1-rc1Junio C Hamano
2006-06-22Merge branch 'js/lsfix'Junio C Hamano
2006-06-22Merge branch 'ew/rebase'Junio C Hamano
2006-06-22Merge branch 'jn/web'Junio C Hamano
2006-06-22Merge early parts of branch 'js/diff'Junio C Hamano
2006-06-22Merge branch 'jc/upload-corrupt'Junio C Hamano
2006-06-22Merge branch 'ew/rebase' into nextJunio C Hamano
2006-06-22Merge branch 'jn/web' into nextJunio C Hamano
2006-06-22gitweb: whitespace cleanup around '='Jakub Narebski
2006-06-22gitweb: Use $hash_base as $search_hash if possibleTimo Hirvonen
2006-06-22Merge branch 'jc/waitpid'Junio C Hamano
2006-06-22Merge branch 'ff/c99'Junio C Hamano
2006-06-22Merge branch 'pb/config'Junio C Hamano
2006-06-22Merge branch 'lt/objlist'Junio C Hamano
2006-06-22git-svn: fix commit --edit flag when using SVN:: librariesEric Wong
2006-06-22Makefile: do not force unneeded recompilation upon GIT_VERSION changesJunio C Hamano
2006-06-22rebase --merge: fix for rebasing more than 7 commits.Junio C Hamano