summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'tr/diff-words-test'Junio C Hamano2011-02-0941-255/+933
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t4034 (diff --word-diff): add a minimum Perl drier test vectorJunio C Hamano2011-01-184-0/+58
| * | | | | | | | | t4034 (diff --word-diff): style suggestionsJonathan Nieder2011-01-181-245/+205
| * | | | | | | | | userdiff: simplify word-diff safeguardJonathan Nieder2011-01-181-24/+16
| * | | | | | | | | t4034: bulk verify builtin word regex sanityThomas Rast2011-01-1837-0/+668
* | | | | | | | | | Merge branch 'rr/fi-import-marks-if-exists'Junio C Hamano2011-02-093-3/+72
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fast-import: Introduce --import-marks-if-existsRamkumar Ramachandra2011-01-183-3/+72
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jn/unpack-lstat-failure-report'Junio C Hamano2011-02-091-6/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | unpack-trees: handle lstat failure for existing fileJonathan Nieder2011-01-131-1/+3
| * | | | | | | | | | unpack-trees: handle lstat failure for existing directoryJonathan Nieder2011-01-131-5/+9
* | | | | | | | | | | Merge branch 'ef/alias-via-run-command'Junio C Hamano2011-02-091-17/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | alias: use run_command api to execute aliasesErik Faye-Lund2011-01-061-17/+17
* | | | | | | | | | | | Merge branch 'cb/setup'Junio C Hamano2011-02-091-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | setup: translate symlinks in filename when using absolute pathsCarlo Marcelo Arenas Belon2011-01-041-4/+7
* | | | | | | | | | | | | Merge branch 'ae/better-template-failure-report'Junio C Hamano2011-02-094-4/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Improve error messages when temporary file creation failsArnout Engelen2010-12-214-4/+56
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jn/cherry-pick-strategy-option'Junio C Hamano2011-02-097-11/+97
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | cherry-pick/revert: add support for -X/--strategy-optionJonathan Nieder2010-12-287-11/+97
* | | | | | | | | | | | | Merge branch 'maint-1.7.0' into maintJunio C Hamano2011-02-093-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | fast-import: introduce "feature notes" commandJonathan Nieder2011-02-093-0/+9
| * | | | | | | | | | | | fast-import: clarify documentation of "feature" commandJonathan Nieder2011-02-091-20/+17
* | | | | | | | | | | | | Documentation/merge subtree How-To: fix typoUwe Kleine-König2011-02-091-1/+1
* | | | | | | | | | | | | pull: Document the "--[no-]recurse-submodules" optionsJens Lehmann2011-02-072-2/+9
* | | | | | | | | | | | | quote.h: simplify the inclusionJonathan Nieder2011-02-071-2/+1
* | | | | | | | | | | | | sha1_object_info: examine cached_object store tooNguyễn Thái Ngọc Duy2011-02-071-0/+8
* | | | | | | | | | | | | sha1_file.c: move find_cached_object up so sha1_object_info can use itNguyễn Thái Ngọc Duy2011-02-071-35/+35
* | | | | | | | | | | | | Add const to parse_{commit,tag}_buffer()Nguyễn Thái Ngọc Duy2011-02-074-6/+6
* | | | | | | | | | | | | diff: support --cached on unborn branchesNguyễn Thái Ngọc Duy2011-02-075-2/+71
* | | | | | | | | | | | | gitweb: Mention optional Perl modules in INSTALLJakub Narebski2011-02-071-0/+6
* | | | | | | | | | | | | post-receive-email: suppress error if description file missingSitaram Chamarty2011-02-071-1/+1
* | | | | | | | | | | | | t7407: fix line endings for mingw buildPat Thoyts2011-02-071-0/+4
* | | | | | | | | | | | | t4120-apply-popt: help systems with core.filemode=falseJohannes Sixt2011-02-071-2/+7
* | | | | | | | | | | | | t3509: use unconstrained initial test to setup repository.Pat Thoyts2011-02-071-2/+4
* | | | | | | | | | | | | start_command: flush buffers in the WIN32 code path as wellJohannes Sixt2011-02-071-1/+1
* | | | | | | | | | | | | bundle: Use OFS_DELTA in bundle filesShawn O. Pearce2011-02-061-2/+3
* | | | | | | | | | | | | Merge branch 'jl/fetch-submodule-recursive' into maintJunio C Hamano2011-01-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t5526: Fix wrong argument order in "git config"Jens Lehmann2011-01-311-1/+1
* | | | | | | | | | | | | | Git 1.7.4v1.7.4ko-masterJunio C Hamano2011-01-303-3/+11
| |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Don't pass "--xhtml" to hightlight in gitweb.perl script.Adam Tkac2011-01-271-1/+1
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-01-275-3/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | rebase -i: clarify in-editor documentation of "exec"ko-maintJonathan Nieder2011-01-271-1/+1
| * | | | | | | | | | | | tests: sanitize more git environment variablesJeff King2011-01-271-0/+3
| * | | | | | | | | | | | Merge branch 'jn/fast-import-empty-tree-removal' into maintJunio C Hamano2011-01-272-0/+48
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | fast-import: treat filemodify with empty tree as deleteJonathan Nieder2011-01-272-0/+48
| * | | | | | | | | | | | | rebase: give a better error message for bogus branchJeff King2011-01-261-0/+1
| * | | | | | | | | | | | | rebase: use explicit "--" with checkoutJeff King2011-01-262-2/+2
* | | | | | | | | | | | | | Git 1.7.4-rc3v1.7.4-rc3Junio C Hamano2011-01-241-7/+1
* | | | | | | | | | | | | | Merge branch 'as/userdiff-pascal'Junio C Hamano2011-01-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | userdiff: match Pascal class methodsAlexey Shumkin2011-01-111-1/+1
* | | | | | | | | | | | | | | Merge branch 'jn/setup-fixes'Junio C Hamano2011-01-246-4470/+743
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \