summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sp/runtime-prefix'Junio C Hamano2009-02-0121-46/+151
|\
| * Windows: Revert to default paths and convert them by RUNTIME_PREFIXSteffen Prohaska2009-01-261-3/+1
| * Compute prefix at runtime if RUNTIME_PREFIX is setSteffen Prohaska2009-01-262-0/+47
| * Modify setup_path() to only add git_exec_path() to PATHSteffen Prohaska2009-01-261-3/+1
| * Add calls to git_extract_argv0_path() in programs that call git_config_*Steffen Prohaska2009-01-2616-0/+45
| * git_extract_argv0_path(): Move check for valid argv0 from caller to calleeSteffen Prohaska2009-01-262-4/+7
| * Refactor git_set_argv0_path() to git_extract_argv0_path()Steve Haslam2009-01-263-18/+19
| * Move computation of absolute paths from Makefile to runtime (in preparation f...Steffen Prohaska2009-01-263-23/+36
* | Merge branch 'jk/signal-cleanup'Junio C Hamano2009-02-0114-75/+197
|\ \
| * | t0005: use SIGTERM for sigchain testJeff King2009-01-302-5/+5
| * | pager: do wait_for_pager on signal deathJeff King2009-01-221-0/+9
| * | refactor signal handling for cleanup functionsJeff King2009-01-228-13/+17
| * | chain kill signals for cleanup functionsJeff King2009-01-2212-19/+125
| * | diff: refactor tempfile cleanup handlingJeff King2009-01-221-52/+55
| * | Windows: Fix signal numbersJohannes Sixt2009-01-221-6/+6
* | | Merge branch 'jg/mergetool'Junio C Hamano2009-02-011-10/+8
|\ \ \
| * | | mergetool: Don't repeat merge tool candidatesJohannes Gilger2009-01-271-10/+8
* | | | Merge branch 'maint'Junio C Hamano2009-02-011-3/+6
|\ \ \ \
| * \ \ \ Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-02-011-3/+6
| |\ \ \ \
| | * | | | merge: fix out-of-bounds memory accessRené Scharfe2009-01-311-3/+6
* | | | | | contrib/difftool: Don't repeat merge tool candidatesDavid Aguilar2009-02-011-19/+12
* | | | | | contrib/difftool: add support for KompareMarkus Heidelberg2009-02-012-7/+12
* | | | | | t3412: clean up GIT_EDITOR usageThomas Rast2009-01-311-25/+13
* | | | | | git-shortlog.txt: fix example about .mailmapMichele Ballabio2009-01-311-1/+1
* | | | | | git-cvsserver: run post-update hook *after* update.Stefan Karpinski2009-01-311-2/+2
* | | | | | Fix 'git diff --no-index' with a non-existing symlink targetJohannes Schindelin2009-01-312-1/+8
* | | | | | gitweb: align comments to codeGiuseppe Bilotta2009-01-311-4/+4
* | | | | | gitweb: webserver config for PATH_INFOGiuseppe Bilotta2009-01-311-0/+76
* | | | | | gitweb: make static files accessible with PATH_INFOGiuseppe Bilotta2009-01-311-0/+5
* | | | | | git-cvsserver: handle CVS 'noop' command.Stefan Karpinski2009-01-311-0/+1
* | | | | | Update draft release notes to 1.6.2Junio C Hamano2009-01-291-12/+53
* | | | | | Sync with 1.6.1.2Junio C Hamano2009-01-292-1/+41
|\| | | | |
| * | | | | GIT 1.6.1.2v1.6.1.2Junio C Hamano2009-01-293-2/+41
| * | | | | Merge branch 'jc/maint-format-patch-o-relative' into maintJunio C Hamano2009-01-292-4/+76
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'bs/maint-rename-populate-filespec' into maintJunio C Hamano2009-01-291-2/+7
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'mh/maint-commit-color-status' into maintJunio C Hamano2009-01-291-0/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'nd/grep-assume-unchanged' into maintJunio C Hamano2009-01-292-2/+20
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/maint-ls-tree' into maintJunio C Hamano2009-01-292-2/+13
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'np/no-loosen-prune-expire-now' into maintJunio C Hamano2009-01-292-3/+9
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'mc/cd-p-pwd' into maintJunio C Hamano2009-01-292-3/+3
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-01-291-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | avoid 31-bit truncation in write_loose_objectJeff King2009-01-291-1/+2
* | | | | | | | | | | | | Simplify t3412Johannes Schindelin2009-01-291-21/+7
* | | | | | | | | | | | | Simplify t3411Johannes Schindelin2009-01-291-48/+17
* | | | | | | | | | | | | Simplify t3410Johannes Schindelin2009-01-291-89/+35
* | | | | | | | | | | | | test-lib.sh: introduce test_commit() and test_merge() helpersJohannes Schindelin2009-01-292-0/+43
* | | | | | | | | | | | | lib-rebase.sh: Document what set_fake_editor() doesJohannes Schindelin2009-01-291-0/+12
* | | | | | | | | | | | | t3404 & t3411: undo copy&pasteJohannes Schindelin2009-01-293-67/+44
* | | | | | | | | | | | | Merge branch 'tr/previous-branch'Junio C Hamano2009-01-299-7/+324
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t1505: remove debugging cruftThomas Rast2009-01-251-2/+0