| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'jn/userdiff-perl-updates' | Junio C Hamano | 2011-05-26 | 2 | -34/+134 |
|\ |
|
| * | userdiff/perl: tighten BEGIN/END block pattern to reject here-doc delimiters | Jonathan Nieder | 2011-05-23 | 1 | -2/+15 |
| * | tests: make test_expect_code quieter on success | Jonathan Nieder | 2011-05-21 | 1 | -4/+3 |
| * | userdiff/perl: catch sub with brace on second line | Jonathan Nieder | 2011-05-21 | 1 | -2/+23 |
| * | userdiff/perl: match full line of POD headers | Jonathan Nieder | 2011-05-21 | 1 | -0/+4 |
| * | userdiff/perl: anchor "sub" and "package" patterns on the left | Jonathan Nieder | 2011-05-21 | 1 | -3/+56 |
| * | t4018 (funcname patterns): minor cleanups | Jonathan Nieder | 2011-05-21 | 1 | -24/+25 |
| * | t4018 (funcname patterns): make configuration easier to track | Jonathan Nieder | 2011-05-21 | 1 | -7/+12 |
| * | t4018 (funcname patterns): make .gitattributes state easier to track | Jonathan Nieder | 2011-05-21 | 1 | -2/+6 |
* | | Merge branch 'jn/ctags-more' | Junio C Hamano | 2011-05-26 | 1 | -0/+8 |
|\ \ |
|
| * | | gitweb: Optional grouping of projects by category | Sebastien Cevey | 2011-04-29 | 1 | -0/+8 |
* | | | Sync with 1.7.5.3 | Junio C Hamano | 2011-05-26 | 1 | -104/+2 |
|\ \ \ |
|
| * \ \ | Merge branch 'jm/maint-diff-words-with-sbe' into maint | Junio C Hamano | 2011-05-26 | 1 | -0/+26 |
| |\ \ \ |
|
| * \ \ \ | Merge branch 'jc/maint-pathspec-stdin-and-cmdline' into maint | Junio C Hamano | 2011-05-26 | 1 | -0/+17 |
| |\ \ \ \ |
|
| * \ \ \ \ | Merge branch 'jk/cherry-pick-root-with-resolve' into maint | Junio C Hamano | 2011-05-26 | 1 | -2/+25 |
| |\ \ \ \ \ |
|
| * \ \ \ \ \ | Merge branch 'jk/git-connection-deadlock-fix' into maint | Junio C Hamano | 2011-05-26 | 1 | -0/+43 |
| |\ \ \ \ \ \ |
|
| * \ \ \ \ \ \ | Merge branch 'svn-fe-maint' of git://repo.or.cz/git/jrn into maint | Junio C Hamano | 2011-05-26 | 1 | -104/+2 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | Revert "t0081 (line-buffer): add buffering tests" | Jonathan Nieder | 2011-03-30 | 1 | -104/+2 |
* | | | | | | | | | Merge branch 'jc/bigfile' | Junio C Hamano | 2011-05-25 | 1 | -0/+27 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Bigfile: teach "git add" to send a large file straight to a pack | Junio C Hamano | 2011-05-13 | 1 | -0/+27 |
* | | | | | | | | | | Merge branch 'js/log-abbrev-commit-config' | Junio C Hamano | 2011-05-25 | 1 | -0/+53 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | Add log.abbrevCommit config variable | Jay Soffian | 2011-05-18 | 1 | -0/+53 |
* | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-05-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \
| | |_|/ / / / / / / /
| |/| | | | | | | | | |
|
| * | | | | | | | | | | init/clone: remove short option -L and document --separate-git-dir | Nguyen Thai Ngoc Duy | 2011-05-25 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|/
| |/| | | | | | | | |
|
* | | | | | | | | | | Merge branch 'jm/maint-diff-words-with-sbe' | Junio C Hamano | 2011-05-23 | 1 | -0/+26 |
|\ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|/ /
| |/| | | | | | | | |
|
| * | | | | | | | | | do not read beyond end of malloc'd buffer | Jim Meyering | 2011-05-20 | 1 | -0/+26 |
* | | | | | | | | | | Merge branch 'ms/ls-remote-exit-with-status' | Junio C Hamano | 2011-05-23 | 1 | -0/+24 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | ls-remote: the --exit-code option reports "no matching refs" | Michael Schubert | 2011-05-18 | 1 | -0/+24 |
| | |_|/ / / / / / /
| |/| | | | | | | | |
|
* | | | | | | | | | | Merge branch 'ab/i18n-scripts-basic' | Junio C Hamano | 2011-05-23 | 1 | -0/+51 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext() | Ævar Arnfjörð Bjarmason | 2011-05-14 | 1 | -0/+51 |
* | | | | | | | | | | | Merge branch 'jc/magic-pathspec' | Junio C Hamano | 2011-05-23 | 2 | -0/+94 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | t3703: Skip tests using directory name ":" on Windows | Johannes Sixt | 2011-05-12 | 1 | -2/+6 |
| * | | | | | | | | | | | Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline' | Junio C Hamano | 2011-05-11 | 1 | -0/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | t3703, t4208: add test cases for magic pathspec | Nguyễn Thái Ngọc Duy | 2011-05-10 | 2 | -0/+90 |
* | | | | | | | | | | | | | Merge branch 'jk/blame-line-porcelain' | Junio C Hamano | 2011-05-23 | 1 | -0/+90 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | blame: add --line-porcelain output format | Jeff King | 2011-05-09 | 1 | -0/+19 |
| * | | | | | | | | | | | | | add tests for various blame formats | Jeff King | 2011-05-09 | 1 | -0/+71 |
| | |_|/ / / / / / / / / /
| |/| | | | | | | | | | | |
|
* | | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-05-20 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|/ / / / / / /
| |/| | | | | | | | | | | |
|
| * | | | | | | | | | | | | git-svn: Fix git svn log --show-commit | Michael J Gruber | 2011-05-20 | 1 | -0/+15 |
| * | | | | | | | | | | | | Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maint | Junio C Hamano | 2011-05-16 | 1 | -2/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/fix-add-u-unmerged' into maint | Junio C Hamano | 2011-05-16 | 1 | -17/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-branch-mergeoptions' into maint | Junio C Hamano | 2011-05-16 | 1 | -0/+32 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-add-p-overlapping-hunks' into maint | Junio C Hamano | 2011-05-16 | 1 | -0/+36 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jl/submodule-conflicted-gitmodules' | Junio C Hamano | 2011-05-19 | 1 | -4/+88 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | Submodules: Don't parse .gitmodules when it contains, merge conflicts | Jens Lehmann | 2011-05-14 | 1 | -3/+3 |
| * | | | | | | | | | | | | | | | | | test that git status works with merge conflict in, .gitmodules | Heiko Voigt | 2011-05-14 | 1 | -4/+88 |
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/replacing' | Junio C Hamano | 2011-05-19 | 1 | -2/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | t6050: make sure we test not just commit replacement | Junio C Hamano | 2011-05-15 | 1 | -2/+16 |
| | |_|_|_|_|_|/ / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | Merge branch 'nd/sparse-co-fix' | Junio C Hamano | 2011-05-19 | 1 | -4/+49 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | sparse checkout: do not eagerly decide the fate for whole directory | Nguyễn Thái Ngọc Duy | 2011-05-10 | 1 | -0/+41 |