summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* --name-only, --name-status, --check and -s are mutually exclusiveTimo Hirvonen2006-07-011-0/+13
* builtin-diff: turn recursive on when defaulting to --patch format.Junio C Hamano2006-07-011-1/+3
* Merge branch 'jc/diff-test-updates' into th/diffJunio C Hamano2006-06-294-6/+68
|\
| * t4013: note improvements brought by the new output code.Junio C Hamano2006-06-294-6/+68
| * Merge branch 'jc/diff-test' into jc/diff-test-updatesJunio C Hamano2006-06-297-1/+581
| |\
* | \ Merge branch 'jc/diff-test' into th/diffJunio C Hamano2006-06-297-1/+581
|\ \ \ | | |/ | |/|
| * | t4013: add format-patch tests.Junio C Hamano2006-06-297-1/+581
* | | format-patch: fix diff format option implementationJunio C Hamano2006-06-291-1/+2
* | | Merge branch 'jc/diff-test-updates' into th/diffJunio C Hamano2006-06-286-10/+4
|\ \ \ | | |/ | |/|
| * | t4013 test updates for new output code.Junio C Hamano2006-06-276-10/+4
| |/
* | combine-diff.c: type sanity.Junio C Hamano2006-06-281-1/+1
* | Fix some more diff options changes.Junio C Hamano2006-06-274-19/+38
* | Merge branch 'jc/diff-test' into th/diffJunio C Hamano2006-06-2789-0/+3839
|\ \ | |/
| * t4013: add more tests around -c and --ccJunio C Hamano2006-06-2618-3/+1263
| * t4013: add tests for diff/log family output options.Junio C Hamano2006-06-2672-0/+2579
* | Fix diff-tree -sTimo Hirvonen2006-06-271-3/+0
* | log --raw: Don't descend into subdirectories by defaultTimo Hirvonen2006-06-271-1/+0
* | diff-tree: Use ---\n as a message separatorTimo Hirvonen2006-06-271-0/+1
* | Print empty line between raw, stat, summary and patchTimo Hirvonen2006-06-271-5/+42
* | whatchanged: Default to DIFF_FORMAT_RAWTimo Hirvonen2006-06-261-11/+16
* | Don't xcalloc() struct diffstat_tTimo Hirvonen2006-06-261-6/+5
* | Add msg_sep to diff_optionsTimo Hirvonen2006-06-266-13/+14
* | DIFF_FORMAT_RAW is not default anymoreTimo Hirvonen2006-06-262-6/+2
* | Set default diff output format after parsing command lineTimo Hirvonen2006-06-267-3/+18
* | Make --raw option available for all diff commandsTimo Hirvonen2006-06-262-36/+14
* | Merge with_raw, with_stat and summary variables to output_formatTimo Hirvonen2006-06-266-144/+136
|/
* 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
View Lorry Controller Status