Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'gv/portable' | Junio C Hamano | 2010-06-21 | 20 | -56/+66 |
|\ | |||||
| * | test-lib: use DIFF definition from GIT-BUILD-OPTIONS | Junio C Hamano | 2010-06-11 | 1 | -10/+10 |
| * | test_cmp: do not use "diff -u" on platforms that lack one | Gary V. Vaughan | 2010-05-31 | 1 | -0/+1 |
| * | fixup: do not unconditionally disable "diff -u" | Junio C Hamano | 2010-05-31 | 2 | -5/+10 |
| * | tests: use "test_cmp", not "diff", when verifying the result | Gary V. Vaughan | 2010-05-31 | 19 | -55/+59 |
* | | Merge branch 'bc/portable' | Junio C Hamano | 2010-06-21 | 5 | -11/+19 |
|\ \ | |||||
| * | | Remove python 2.5'isms | Brandon Casey | 2010-06-13 | 1 | -2/+2 |
| * | | t/aggregate-results: accomodate systems with small max argument list length | Brandon Casey | 2010-06-02 | 2 | -2/+4 |
| * | | t/t7006: ignore return status of shell's unset builtin | Brandon Casey | 2010-06-02 | 1 | -5/+5 |
| * | | t/t5150: remove space from sed script | Brandon Casey | 2010-06-02 | 1 | -2/+2 |
| * | | t/t5800: skip if python version is older than 2.5 | Brandon Casey | 2010-06-02 | 1 | -2/+8 |
* | | | Merge branch 'em/checkout-orphan' | Junio C Hamano | 2010-06-21 | 2 | -21/+81 |
|\ \ \ | |||||
| * | | | t3200: test -l with core.logAllRefUpdates options | Erick Mattos | 2010-06-03 | 1 | -0/+24 |
| * | | | checkout --orphan: respect -l option always | Erick Mattos | 2010-06-03 | 1 | -21/+57 |
* | | | | Merge branch 'cc/maint-diff-CC-binary' | Junio C Hamano | 2010-06-18 | 2 | -0/+82 |
|\ \ \ \ | |||||
| * | | | | diff: fix "git show -C -C" output when renaming a binary file | Christian Couder | 2010-06-06 | 2 | -0/+82 |
* | | | | | Merge branch 'cb/ls-files-cdup' | Junio C Hamano | 2010-06-18 | 1 | -8/+4 |
|\ \ \ \ \ | |||||
| * | | | | | ls-files: allow relative pathspec | Clemens Buchacher | 2010-06-05 | 1 | -8/+4 |
* | | | | | | Merge branch 'jc/t9129-any-utf8' | Junio C Hamano | 2010-06-18 | 1 | -7/+13 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t9129: fix UTF-8 locale detection | Junio C Hamano | 2010-06-02 | 1 | -7/+13 |
* | | | | | | | Merge branch 'jn/rebase-cmdline-fix' | Junio C Hamano | 2010-06-18 | 1 | -1/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rebase: improve error message when upstream argument is missing | Jonathan Nieder | 2010-05-31 | 1 | -1/+12 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jh/diff-index-line-abbrev' | Junio C Hamano | 2010-06-18 | 1 | -0/+35 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s | Johan Herland | 2010-05-31 | 1 | -0/+35 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'mg/status-b' | Junio C Hamano | 2010-06-18 | 1 | -1/+46 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Documentation+t5708: document and test status -s -b | Michael J Gruber | 2010-06-03 | 1 | -1/+46 |
* | | | | | | | | Merge branch 'jn/gitweb-plackup' | Junio C Hamano | 2010-06-18 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | gitweb: Move static files into seperate subdirectory | Pavan Kumar Sunkara | 2010-05-31 | 1 | -3/+3 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jk/url-decode' | Junio C Hamano | 2010-06-18 | 1 | -0/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | decode file:// and ssh:// URLs | Jeff King | 2010-05-24 | 1 | -0/+12 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jn/remote-set-branches' | Junio C Hamano | 2010-06-18 | 1 | -0/+88 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add git remote set-branches | Jonathan Nieder | 2010-05-19 | 1 | -0/+88 |
* | | | | | | | | | Merge branch 'rc/ls-remote-default' | Junio C Hamano | 2010-06-18 | 1 | -4/+20 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | ls-remote: print URL when no repo is specified | Tay Ray Chuan | 2010-05-11 | 1 | -4/+20 |
* | | | | | | | | | | Merge branch 'hg/id-munging' | Junio C Hamano | 2010-06-18 | 1 | -6/+10 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | convert: Keep foreign $Id$ on checkout. | Henrik Grubbström | 2010-04-10 | 1 | -1/+1 |
| * | | | | | | | | | | convert: Safer handling of $Id$ contraction. | Henrik Grubbström | 2010-04-10 | 1 | -6/+10 |
* | | | | | | | | | | | Merge branch 'tc/merge-m-log' | Junio C Hamano | 2010-06-18 | 1 | -4/+20 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | merge: --log appends shortlog to message if specified | Tay Ray Chuan | 2010-05-10 | 1 | -1/+1 |
| * | | | | | | | | | | | t7604-merge-custom-message: show that --log doesn't append to -m | Tay Ray Chuan | 2010-05-10 | 1 | -0/+12 |
| * | | | | | | | | | | | t7604-merge-custom-message: shift expected output creation | Tay Ray Chuan | 2010-05-10 | 1 | -4/+8 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'ab/cvsserver' | Junio C Hamano | 2010-06-13 | 1 | -1/+15 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | git-cvsserver: test for pserver authentication support | Ævar Arnfjörð Bjarmason | 2010-05-19 | 1 | -1/+15 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'mg/notes-dry-run' | Junio C Hamano | 2010-06-13 | 1 | -2/+46 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | notes: dry-run and verbose options for prune | Michael J Gruber | 2010-05-19 | 1 | -2/+46 |
* | | | | | | | | | | | | Merge branch 'jn/fsck-ident' | Junio C Hamano | 2010-06-13 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | fsck: fix bogus commit header check | Jonathan Nieder | 2010-05-28 | 1 | -0/+8 |
* | | | | | | | | | | | | | Merge branch 'ab/submodule-foreach-toplevel' | Junio C Hamano | 2010-06-13 | 1 | -3/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | git-submodule foreach: Add $toplevel variable | Ævar Arnfjörð Bjarmason | 2010-05-25 | 1 | -3/+7 |
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'rs/grep-binary' | Junio C Hamano | 2010-06-13 | 1 | -0/+102 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |