Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sb/opt-filename' | Junio C Hamano | 2009-05-31 | 1 | -2/+17 |
|\ | |||||
| * | parse-opts: add OPT_FILENAME and transition builtins | Stephen Boyd | 2009-05-25 | 1 | -2/+17 |
| * | Merge branch 'jc/mktree' into sb/opt-filename | Junio C Hamano | 2009-05-25 | 1 | -0/+71 |
| |\ | |||||
| * \ | Merge branch 'master' into sb/opt-filename | Junio C Hamano | 2009-05-25 | 169 | -829/+3964 |
| |\ \ | |||||
* | \ \ | Merge branch 'jc/mktree' | Junio C Hamano | 2009-05-31 | 1 | -0/+71 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | mktree --missing: allow missing objects | Junio C Hamano | 2009-05-10 | 1 | -0/+10 |
| * | | | t1010: add mktree test | Junio C Hamano | 2009-05-10 | 1 | -0/+61 |
* | | | | Merge branch 'ew/svn-test-and-old-i18n' | Junio C Hamano | 2009-05-31 | 13 | -82/+82 |
|\ \ \ \ | |||||
| * \ \ \ | t9139 uses ancient, backwards-compatible iconv names | Eric Wong | 2009-05-30 | 13 | -82/+82 |
| |\ \ \ \ | |||||
| | * | | | | t8005: fix typo, it's ISO-8859-5, not KOI8-R | Brandon Casey | 2009-05-27 | 1 | -1/+1 |
| | * | | | | t8005: convert CP1251 character set to ISO8859-5 | Brandon Casey | 2009-05-22 | 3 | -15/+15 |
| | * | | | | t8005: use more portable character encoding names | Brandon Casey | 2009-05-22 | 1 | -3/+3 |
| | * | | | | t5100: use ancient encoding syntax for backwards compatibility | Brandon Casey | 2009-05-18 | 2 | -20/+20 |
| | * | | | | t9301: use ISO8859-1 rather than ISO-8859-1 | Brandon Casey | 2009-05-18 | 1 | -1/+1 |
| | * | | | | t3901: Use ISO8859-1 instead of ISO-8859-1 for backward compatibility | Brandon Casey | 2009-05-18 | 1 | -20/+20 |
| | * | | | | t3901: avoid negation on right hand side of '|' | Brandon Casey | 2009-05-18 | 1 | -1/+1 |
| | * | | | | t3900: use ancient iconv names for backward compatibility | Brandon Casey | 2009-05-18 | 5 | -20/+20 |
* | | | | | | 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 |