Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jg/tag-contains' | Junio C Hamano | 2009-02-01 | 8 | -38/+185 |
|\ | |||||
| * | git-tag: Add --contains option | Jake Goulding | 2009-01-28 | 3 | -3/+146 |
| * | Make has_commit() non-static | Jake Goulding | 2009-01-28 | 3 | -17/+19 |
| * | Make opt_parse_with_commit() non-static | Jake Goulding | 2009-01-28 | 3 | -18/+20 |
* | | Merge branch 'js/maint-rebase-i-submodule' | Junio C Hamano | 2009-02-01 | 2 | -5/+30 |
|\ \ | |||||
| * | | Fix submodule squashing into unrelated commit | Johannes Schindelin | 2009-01-28 | 2 | -6/+5 |
| * | | rebase -i squashes submodule changes into unrelated commit | Junio C Hamano | 2009-01-28 | 1 | -0/+26 |
* | | | Merge branch 'jc/maint-split-diff-metainfo' | Junio C Hamano | 2009-02-01 | 3 | -67/+99 |
|\ \ \ | |||||
| * \ \ | Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-me... | Junio C Hamano | 2009-01-27 | 3 | -67/+99 |
| |\ \ \ | |||||
| | * | | | diff.c: output correct index lines for a split diff | Junio C Hamano | 2009-01-27 | 2 | -66/+98 |
* | | | | | Merge branch 'sp/runtime-prefix' | Junio C Hamano | 2009-02-01 | 21 | -46/+151 |
|\ \ \ \ \ | |||||
| * | | | | | Windows: Revert to default paths and convert them by RUNTIME_PREFIX | Steffen Prohaska | 2009-01-26 | 1 | -3/+1 |
| * | | | | | Compute prefix at runtime if RUNTIME_PREFIX is set | Steffen Prohaska | 2009-01-26 | 2 | -0/+47 |
| * | | | | | Modify setup_path() to only add git_exec_path() to PATH | Steffen Prohaska | 2009-01-26 | 1 | -3/+1 |
| * | | | | | Add calls to git_extract_argv0_path() in programs that call git_config_* | Steffen Prohaska | 2009-01-26 | 16 | -0/+45 |
| * | | | | | git_extract_argv0_path(): Move check for valid argv0 from caller to callee | Steffen Prohaska | 2009-01-26 | 2 | -4/+7 |
| * | | | | | Refactor git_set_argv0_path() to git_extract_argv0_path() | Steve Haslam | 2009-01-26 | 3 | -18/+19 |
| * | | | | | Move computation of absolute paths from Makefile to runtime (in preparation f... | Steffen Prohaska | 2009-01-26 | 3 | -23/+36 |
* | | | | | | Merge branch 'jk/signal-cleanup' | Junio C Hamano | 2009-02-01 | 14 | -75/+197 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t0005: use SIGTERM for sigchain test | Jeff King | 2009-01-30 | 2 | -5/+5 |
| * | | | | | | pager: do wait_for_pager on signal death | Jeff King | 2009-01-22 | 1 | -0/+9 |
| * | | | | | | refactor signal handling for cleanup functions | Jeff King | 2009-01-22 | 8 | -13/+17 |
| * | | | | | | chain kill signals for cleanup functions | Jeff King | 2009-01-22 | 12 | -19/+125 |
| * | | | | | | diff: refactor tempfile cleanup handling | Jeff King | 2009-01-22 | 1 | -52/+55 |
| * | | | | | | Windows: Fix signal numbers | Johannes Sixt | 2009-01-22 | 1 | -6/+6 |
* | | | | | | | Merge branch 'jg/mergetool' | Junio C Hamano | 2009-02-01 | 1 | -10/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | mergetool: Don't repeat merge tool candidates | Johannes Gilger | 2009-01-27 | 1 | -10/+8 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-02-01 | 1 | -3/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'maint-1.6.0' into maint | Junio C Hamano | 2009-02-01 | 1 | -3/+6 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | merge: fix out-of-bounds memory access | René Scharfe | 2009-01-31 | 1 | -3/+6 |
* | | | | | | | | | | contrib/difftool: Don't repeat merge tool candidates | David Aguilar | 2009-02-01 | 1 | -19/+12 |
* | | | | | | | | | | contrib/difftool: add support for Kompare | Markus Heidelberg | 2009-02-01 | 2 | -7/+12 |
* | | | | | | | | | | t3412: clean up GIT_EDITOR usage | Thomas Rast | 2009-01-31 | 1 | -25/+13 |
* | | | | | | | | | | git-shortlog.txt: fix example about .mailmap | Michele Ballabio | 2009-01-31 | 1 | -1/+1 |
* | | | | | | | | | | git-cvsserver: run post-update hook *after* update. | Stefan Karpinski | 2009-01-31 | 1 | -2/+2 |
* | | | | | | | | | | Fix 'git diff --no-index' with a non-existing symlink target | Johannes Schindelin | 2009-01-31 | 2 | -1/+8 |
* | | | | | | | | | | gitweb: align comments to code | Giuseppe Bilotta | 2009-01-31 | 1 | -4/+4 |
* | | | | | | | | | | gitweb: webserver config for PATH_INFO | Giuseppe Bilotta | 2009-01-31 | 1 | -0/+76 |
* | | | | | | | | | | gitweb: make static files accessible with PATH_INFO | Giuseppe Bilotta | 2009-01-31 | 1 | -0/+5 |
* | | | | | | | | | | git-cvsserver: handle CVS 'noop' command. | Stefan Karpinski | 2009-01-31 | 1 | -0/+1 |
* | | | | | | | | | | Update draft release notes to 1.6.2 | Junio C Hamano | 2009-01-29 | 1 | -12/+53 |
* | | | | | | | | | | Sync with 1.6.1.2 | Junio C Hamano | 2009-01-29 | 2 | -1/+41 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | GIT 1.6.1.2v1.6.1.2 | Junio C Hamano | 2009-01-29 | 3 | -2/+41 |
| * | | | | | | | | | Merge branch 'jc/maint-format-patch-o-relative' into maint | Junio C Hamano | 2009-01-29 | 2 | -4/+76 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'bs/maint-rename-populate-filespec' into maint | Junio C Hamano | 2009-01-29 | 1 | -2/+7 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/maint-commit-color-status' into maint | Junio C Hamano | 2009-01-29 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/grep-assume-unchanged' into maint | Junio C Hamano | 2009-01-29 | 2 | -2/+20 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-ls-tree' into maint | Junio C Hamano | 2009-01-29 | 2 | -2/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'np/no-loosen-prune-expire-now' into maint | Junio C Hamano | 2009-01-29 | 2 | -3/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mc/cd-p-pwd' into maint | Junio C Hamano | 2009-01-29 | 2 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |