summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make some strings constTimo Hirvonen2006-06-2811-15/+16
* rebase: get rid of outdated MRESOLVEMSGEric Wong2006-06-281-8/+3
* git wrapper: fix command name in an error message.Andreas Ericsson2006-06-281-2/+1
* git-svn: be verbose by default on fetch/commit, add -q/--quiet optionEric Wong2006-06-281-11/+23
* git-svn: add --follow-parent and --no-metadata options to fetchEric Wong2006-06-282-46/+167
* git-svn: add the commit-diff commandEric Wong2006-06-282-19/+112
* git-svn: several graft-branches improvementsEric Wong2006-06-282-13/+230
* git-svn: SVN 1.1.x library compatibilityEric Wong2006-06-284-12/+44
* combine-diff.c: type sanityJunio C Hamano2006-06-281-14/+15
* quote.c: silence compiler warnings from EMIT macroJeff King2006-06-281-1/+1
* Fix expr usage for FreeBSDDennis Stosberg2006-06-277-16/+16
* Merge branch 'jc/squash'Junio C Hamano2006-06-265-24/+72
|\
| * git-merge --squashJunio C Hamano2006-06-245-24/+72
* | Merge branch 'jc/diff'Junio C Hamano2006-06-262-15/+80
|\ \
| * | diff --color: use $GIT_DIR/configJunio C Hamano2006-06-252-15/+80
* | | Merge branch 'ml/cvsimport'Junio C Hamano2006-06-261-17/+23
|\ \ \
| * | | cvsimport: always set $ENV{GIT_INDEX_FILE} to $index{$branch}Johannes Schindelin2006-06-241-7/+8
| * | | cvsimport: setup indexes correctly for ancestors and incremental importsMartin Langhoff2006-06-241-17/+22
* | | | Merge branch 'js/diff'Junio C Hamano2006-06-269-20/+81
|\ \ \ \
| * | | | Teach diff about -b and -w flagsJohannes Schindelin2006-06-239-20/+81
* | | | | Merge branch 'ew/rebase'Junio C Hamano2006-06-264-24/+90
|\ \ \ \ \
| * | | | | rebase: allow --skip to work with --mergeEric Wong2006-06-253-2/+73
| * | | | | rebase: cleanup rebasing with --mergeEric Wong2006-06-251-28/+5
| * | | | | rebase: allow --merge option to handle patches merged upstreamEric Wong2006-06-252-5/+23
| | |_|/ / | |/| | |
* | | | | Fix pkt-line.h to compile with a non-GCC compilerDennis Stosberg2006-06-261-0/+2
* | | | | Solaris needs inclusion of signal.h for signal()Dennis Stosberg2006-06-262-0/+2
* | | | | correct documentation for git grepMatthias Lederhofer2006-06-251-1/+6
|/ / / /
* | | | git-commit: filter out log message lines only when editor was run.Yann Dirson2006-06-251-7/+12
* | | | Rename safe_strncpy() to strlcpy().Peter Eriksen2006-06-2412-30/+48
* | | | apply: replace NO_ACCURATE_DIFF with --inaccurate-eof runtime flag.Johannes Schindelin2006-06-241-9/+16
* | | | Clean up diff.cTimo Hirvonen2006-06-241-12/+6
| |/ / |/| |
* | | repo-config: fix printing of boolJunio C Hamano2006-06-241-6/+3
* | | diff --color: use reset sequence when we mean reset.Junio C Hamano2006-06-241-1/+1
* | | git-repack -- respect -q and be quietMartin Langhoff2006-06-241-2/+3
| |/ |/|
* | git-pull: abort when fmt-merge-msg fails.Junio C Hamano2006-06-241-1/+1
* | Merge branch 'pb/error'Junio C Hamano2006-06-245-6/+52
|\ \
| * | usage: minimum type fix.Junio C Hamano2006-06-241-3/+3
| * | Customizable error handlersPetr Baudis2006-06-242-4/+46
| * | git-merge: Don't use -p when outputting summaryTimo Hirvonen2006-06-231-1/+1
| |/
| * git-commit: allow -e option anywhere on command lineJeff King2006-06-231-1/+3
| * patch-id: take "commit" prefix as well as "diff-tree" prefixJohannes Schindelin2006-06-231-0/+2
* | Makefile: do not recompile main programs when libraries have changed.Junio C Hamano2006-06-221-1/+1
|/
* add GIT-CFLAGS to .gitignoreMatthias Kestenholz2006-06-221-0/+1
* Tweak diff colorsLinus Torvalds2006-06-221-41/+58
* Merge branch 'master' into nextv1.4.1-rc1Junio C Hamano2006-06-224-8/+34
|\
| * Merge branch 'js/lsfix'Junio C Hamano2006-06-229-127/+200
| |\
| * \ Merge branch 'ew/rebase'Junio C Hamano2006-06-223-10/+320
| |\ \
| * \ \ Merge branch 'jn/web'Junio C Hamano2006-06-222-127/+490
| |\ \ \
| * \ \ \ Merge early parts of branch 'js/diff'Junio C Hamano2006-06-223-11/+73
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/upload-corrupt'Junio C Hamano2006-06-2217-293/+338
| |\ \ \ \ \
View Lorry Controller Status