Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'gb/gitweb-avatar' | Junio C Hamano | 2009-07-09 |
|\ | |||
| * | gitweb: (gr)avatar support | Giuseppe Bilotta | 2009-06-30 |
* | | Merge branch 'rs/grep-p' | Junio C Hamano | 2009-07-09 |
|\ \ | |||
| * | | grep -p: support user defined regular expressions | René Scharfe | 2009-07-01 |
| * | | grep: add option -p/--show-function | René Scharfe | 2009-07-01 |
| * | | grep: print context hunk marks between files | René Scharfe | 2009-07-01 |
* | | | Merge branch 'uk/rev-parse-parse-opt' | Junio C Hamano | 2009-07-06 |
|\ \ \ | |||
| * | | | parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-parse | Uwe Kleine-König | 2009-06-13 |
| * | | | more tests for git rev-parse --parse-opt | Uwe Kleine-König | 2009-06-13 |
* | | | | Remove filename from conflict markers | Martin Renold | 2009-07-01 |
* | | | | Merge branch 'cc/bisect' | Junio C Hamano | 2009-07-01 |
|\ \ \ \ | |||
| * | | | | bisect: use a PRNG with a bias when skipping away from untestable commits | Christian Couder | 2009-06-13 |
* | | | | | Merge branch 'sb/quiet-porcelains' | Junio C Hamano | 2009-07-01 |
|\ \ \ \ \ | |||
| * | | | | | stash: teach quiet option | Stephen Boyd | 2009-06-18 |
| * | | | | | am, rebase: teach quiet option | Stephen Boyd | 2009-06-18 |
| * | | | | | t4150: test applying with a newline in subject | Stephen Boyd | 2009-06-18 |
* | | | | | | Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory' | Junio C Hamano | 2009-07-01 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||
| * | | | | | diff-tree -r -t: include added/removed directories in the output | Nick Edelen | 2009-06-13 |
* | | | | | | Merge git://git.bogomips.org/git-svn | Junio C Hamano | 2009-06-27 |
|\ \ \ \ \ \ | |||
| * | | | | | | git svn: cleanup t9138-multiple-branches | Marc Branchaud | 2009-06-27 |
| * | | | | | | t9138: remove stray dot in test which broke bash | Eric Wong | 2009-06-26 |
| * | | | | | | git svn: Support multiple branch and tag paths in the svn repository. | Marc Branchaud | 2009-06-25 |
| * | | | | | | Add 'git svn reset' to unwind 'git svn fetch' | Ben Jackson | 2009-06-25 |
| * | | | | | | git-svn: let 'dcommit $rev' work on $rev instead of HEAD | Thomas Rast | 2009-06-25 |
| | |_|_|_|/ | |/| | | | | |||
* | | | | | | Merge branch 'pb/send-email-cccmd-fix' | Junio C Hamano | 2009-06-27 |
|\ \ \ \ \ \ | |||
| * | | | | | | t/t9001-send-email.sh: ensure generated script is executed with $SHELL_PATH | Brandon Casey | 2009-06-23 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-06-27 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||
| * | | | | | | Test grep --and/--or/--not | Thomas Rast | 2009-06-27 |
| * | | | | | | Test git archive --remote | Thomas Rast | 2009-06-27 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-06-22 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||
| * | | | | | | t3700-add: add a POSIXPERM prerequisite to a new test | Johannes Sixt | 2009-06-22 |
| * | | | | | | Merge branch 'sb/maint-1.6.0-add-config-fix' into maint | Junio C Hamano | 2009-06-22 |
| |\ \ \ \ \ \ | |||
* | \ \ \ \ \ \ | Sync with 1.6.3.3 | Junio C Hamano | 2009-06-21 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||
| * | | | | | | | Merge branch 'cb/maint-no-double-merge' into maint | Junio C Hamano | 2009-06-21 |
| |\ \ \ \ \ \ \ | |||
| * | | | | | | | | t3505: fix abuse of test_expect_code | Junio C Hamano | 2009-06-21 |
* | | | | | | | | | Merge branch 'ph/submodule-rebase' | Junio C Hamano | 2009-06-20 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | git-submodule: add support for --merge. | Johan Herland | 2009-06-03 |
* | | | | | | | | | | Merge branch 'jc/cache-tree' | Junio C Hamano | 2009-06-20 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | Avoid "diff-index --cached" optimization under --find-copies-harder | Junio C Hamano | 2009-05-25 |
| * | | | | | | | | | | t4007: modernize the style | Junio C Hamano | 2009-05-25 |
* | | | | | | | | | | | Merge branch 'mg/pushurl' | Junio C Hamano | 2009-06-20 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | builtin-remote: Show push urls as well | Michael J Gruber | 2009-06-13 |
| * | | | | | | | | | | | t5516: Check pushurl config setting | Michael J Gruber | 2009-06-09 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'sb/pull-rebase' | Junio C Hamano | 2009-06-20 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | parse-remote: support default reflist in get_remote_merge_branch | Santi Béjar | 2009-06-11 |
| |/ / / / / / / / / / | |||
* | | | | | | | | | | | Merge branch 'pb/send-email-cccmd-fix' | Junio C Hamano | 2009-06-20 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||
| * | | | | | | | | | | Test cccmd in t9001-send-email.sh and fix some bugs | Paolo Bonzini | 2009-06-18 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'sb/maint-1.6.0-add-config-fix' | Junio C Hamano | 2009-06-20 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | | | |||
| * | | | | | | | | add: allow configurations to be overriden by command line | Stephen Boyd | 2009-06-18 |
| | |_|_|_|_|/ / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'mh/fix-send-email-threaded' | Junio C Hamano | 2009-06-13 |
|\ \ \ \ \ \ \ \ |