Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'cc/bisect' (early part) | Junio C Hamano | 2009-05-31 | 1 | -12/+1 |
|\ | |||||
| * | bisect: check ancestors without forking a "git rev-list" process | Christian Couder | 2009-05-17 | 1 | -12/+1 |
* | | git-add: no need for -f when resolving a conflict in already tracked path | Jeff King | 2009-05-31 | 1 | -0/+12 |
* | | Merge git://git.bogomips.org/git-svn | Junio C Hamano | 2009-05-30 | 1 | -0/+47 |
|\ \ | |||||
| * | | git-svn: refuse to dcommit non-UTF-8 messages | Eric Wong | 2009-05-28 | 1 | -0/+47 |
* | | | Merge branch 'sb/maint-1.6.2-opt-filename-fix' | Junio C Hamano | 2009-05-29 | 3 | -0/+84 |
|\ \ \ | |||||
| * | | | apply, fmt-merge-msg: use relative filenames | Stephen Boyd | 2009-05-23 | 2 | -0/+74 |
| * | | | commit: -F overrides -t | Stephen Boyd | 2009-05-23 | 1 | -0/+10 |
* | | | | Merge branch 'jc/maint-add-p-coalesce-fix' | Junio C Hamano | 2009-05-29 | 1 | -0/+38 |
|\ \ \ \ | |||||
| * | | | | t3701: ensure correctly set up repository after skipped tests | Johannes Sixt | 2009-05-25 | 1 | -0/+6 |
| * | | | | Revert "git-add--interactive: remove hunk coalescing" | Junio C Hamano | 2009-05-16 | 1 | -1/+1 |
| * | | | | Splitting a hunk that adds a line at the top fails in "add -p" | Matt Graham | 2009-05-16 | 1 | -0/+32 |
* | | | | | Merge branch 'rs/maint-grep-word-regexp-fix' | Junio C Hamano | 2009-05-29 | 1 | -1/+8 |
|\ \ \ \ \ | |||||
| * | | | | | grep: fix word-regexp at the beginning of lines | René Scharfe | 2009-05-23 | 1 | -1/+8 |
* | | | | | | t9120: don't expect failure with SVN_HTTPD_PORT unset | Stephen Boyd | 2009-05-29 | 1 | -11/+6 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-05-28 | 1 | -0/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix segfault showing an empty remote | Clemens Buchacher | 2009-05-27 | 1 | -0/+10 |
| * | | | | | | Merge branch 'jm/format-patch-no-auto-n-when-k-is-given' into maint | Junio C Hamano | 2009-05-25 | 1 | -0/+7 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'do/maint-merge-recursive-fix' into maint | Junio C Hamano | 2009-05-25 | 1 | -0/+95 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | t5500: Modernize test style | Stephen Boyd | 2009-05-27 | 1 | -127/+149 |
| |_|_|_|_|/ / |/| | | | | | | |||||
* | | | | | | | t/t3400-rebase.sh: add more tests to help migrating git-rebase.sh to C | Nguyễn Thái Ngọc Duy | 2009-05-24 | 1 | -0/+31 |
* | | | | | | | Merge branch 'mg/track' | Junio C Hamano | 2009-05-23 | 1 | -0/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix behavior with non-commit upstream references | Michael J Gruber | 2009-05-14 | 1 | -1/+1 |
| * | | | | | | | Test tracking of non-commit upstreams | Michael J Gruber | 2009-05-13 | 1 | -0/+14 |
* | | | | | | | | Merge branch 'fc/decorate-tag' | Junio C Hamano | 2009-05-23 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Prettify log decorations even more | Felipe Contreras | 2009-05-13 | 1 | -3/+3 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jm/format-patch-no-auto-n-when-k-is-given' | Junio C Hamano | 2009-05-23 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | format-patch let -k override a config-specified format.numbered | Jim Meyering | 2009-05-09 | 1 | -0/+7 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'do/maint-merge-recursive-fix' | Junio C Hamano | 2009-05-23 | 1 | -0/+95 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | merge-recursive: never leave index unmerged while recursing | Dave Olszewski | 2009-05-09 | 1 | -0/+95 |
* | | | | | | | Merge branch 'rs/grep-parseopt' | Junio C Hamano | 2009-05-23 | 1 | -2/+54 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | parseopt: add PARSE_OPT_NODASH | René Scharfe | 2009-05-09 | 1 | -0/+7 |
| * | | | | | | | parseopt: add OPT_NUMBER_CALLBACK | René Scharfe | 2009-05-09 | 1 | -0/+18 |
| * | | | | | | | parseopt: add OPT_NEGBIT | René Scharfe | 2009-05-09 | 1 | -2/+29 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'fl/git-pm' | Junio C Hamano | 2009-05-23 | 2 | -8/+19 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Git.pm: Always set Repository to absolute path if autodetecting | Frank Lichtenheld | 2009-05-09 | 1 | -8/+2 |
| * | | | | | | | Git.pm: Set GIT_WORK_TREE if we set GIT_DIR | Frank Lichtenheld | 2009-05-09 | 2 | -0/+17 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'mt/submodule-reference' | Junio C Hamano | 2009-05-23 | 1 | -0/+81 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add --reference option to git submodule. | Michael S. Tsirkin | 2009-05-09 | 1 | -0/+81 |
| |/ / / / / / | |||||
* | | | | | | | git-svn: add --authors-prog option | Mark Lodato | 2009-05-21 | 1 | -0/+69 |
* | | | | | | | git-svn testsuite: use standard configuration for Subversion tools | Eygene Ryabinkin | 2009-05-21 | 29 | -206/+221 |
* | | | | | | | Merge branch 'js/add-edit' | Junio C Hamano | 2009-05-18 | 1 | -0/+121 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t3702: fix reliance on SHELL_PATH being '/bin/sh' | Johannes Schindelin | 2009-04-27 | 1 | -7/+19 |
| * | | | | | | | git-add: introduce --edit (to edit the diff vs. the index) | Johannes Schindelin | 2009-04-12 | 1 | -0/+109 |
* | | | | | | | | Merge branch 'ac/graph-horizontal-line' | Junio C Hamano | 2009-05-18 | 1 | -4/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | graph API: Use horizontal lines for more compact graphs | Allan Caffee | 2009-04-22 | 1 | -4/+2 |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-05-16 | 3 | -0/+25 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | test: checkout shouldn't say that HEAD has moved if it didn't | Nanako Shiraishi | 2009-05-16 | 1 | -0/+8 |
| * | | | | | | | | tests: Add tests for missing format-patch long options | Stephen Boyd | 2009-05-16 | 2 | -0/+17 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Use UTF-8 instead of utf8 for backward compatibility | Alex Riesen | 2009-05-16 | 1 | -2/+2 |