Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | docs: give more hints about how "add -e" works | Jeff King | 2010-11-09 | 1 | -28/+76 | |
| * | | | | | | | | | | | | | docs: give more hints about how "add -e" works | Jeff King | 2010-10-21 | 1 | -3/+29 | |
* | | | | | | | | | | | | | | Merge branch 'bg/maint-gitweb-test-lib' into maint | Junio C Hamano | 2010-12-02 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | t/gitweb-lib: Don't pass constant to decode_utf8 | Brian Gernhardt | 2010-10-20 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'tr/maint-merge-file-subdir' into maint | Junio C Hamano | 2010-12-02 | 3 | -3/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | merge-file: correctly find files when called in subdir | Thomas Rast | 2010-10-18 | 2 | -1/+14 | |
| * | | | | | | | | | | | | | | prefix_filename(): safely handle the case where pfx_len=0 | Thomas Rast | 2010-10-18 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | Merge branch 'ks/no-textconv-symlink' into maint | Junio C Hamano | 2010-12-02 | 6 | -25/+114 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664'' | Kirill Smelkov | 2010-09-29 | 6 | -21/+30 | |
| * | | | | | | | | | | | | | | | blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks | Kirill Smelkov | 2010-09-29 | 2 | -0/+78 | |
| * | | | | | | | | | | | | | | | blame,cat-file: Prepare --textconv tests for correctly-failing conversion pro... | Kirill Smelkov | 2010-09-29 | 2 | -12/+14 | |
* | | | | | | | | | | | | | | | | Merge branch 'bc/fortran-userdiff' into maint | Junio C Hamano | 2010-12-02 | 3 | -1/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | userdiff.c: add builtin fortran regex patterns | Brandon Casey | 2010-09-10 | 3 | -1/+20 | |
* | | | | | | | | | | | | | | | | | Merge branch 'maint-1.7.2' into maint | Junio C Hamano | 2010-12-01 | 4 | -5/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge branch 'maint-1.7.1' into maint-1.7.2 | Junio C Hamano | 2010-12-01 | 2 | -2/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Merge branch 'maint-1.7.0' into maint-1.7.1 | Junio C Hamano | 2010-12-01 | 2 | -2/+7 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | add: introduce add.ignoreerrors synonym for add.ignore-errors | Jonathan Nieder | 2010-12-01 | 2 | -2/+7 | |
| | | | |_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | bash: Match lightweight tags in prompt | knittl | 2010-12-01 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | git-commit.txt: (synopsis): move -i and -o before "--" | Jari Aalto | 2010-12-01 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | Merge branch 'jl/maint-pull-tags-doc' into maint | Junio C Hamano | 2010-11-24 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | pull: Remove --tags option from manpage | Jens Lehmann | 2010-11-03 | 1 | -0/+2 | |
* | | | | | | | | | | | | | | | | | Merge branch 'kb/maint-diff-ws-check' into maint | Junio C Hamano | 2010-11-24 | 4 | -47/+118 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | diff: handle lines containing only whitespace and tabs better | Kevin Ballard | 2010-10-20 | 2 | -3/+41 | |
| * | | | | | | | | | | | | | | | | | test-lib: extend test_decode_color to handle more color codes | Kevin Ballard | 2010-10-20 | 2 | -44/+77 | |
| | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'jm/mailmap' into maint | Junio C Hamano | 2010-11-24 | 2 | -16/+61 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | t4203: do not let "git shortlog" DWIM based on tty | Junio C Hamano | 2010-10-19 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | t4203 (mailmap): stop hardcoding commit ids and dates | Jonathan Nieder | 2010-10-18 | 1 | -9/+17 | |
| * | | | | | | | | | | | | | | | | | mailmap: fix use of freed memory | Jim Meyering | 2010-10-13 | 2 | -7/+44 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'tr/maint-git-repack-tmpfile' into maint | Junio C Hamano | 2010-11-24 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | repack: place temporary packs under .git/objects/pack/ | Thomas Rast | 2010-10-19 | 1 | -2/+3 | |
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-apply-no-binary' into maint | Junio C Hamano | 2010-11-24 | 2 | -1/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | apply: don't segfault on binary files with missing data | Jeff King | 2010-10-29 | 2 | -1/+32 | |
| |/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'jn/send-pack-error' into maint | Junio C Hamano | 2010-11-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | send-pack: avoid redundant "pack-objects died with strange error" | Jonathan Nieder | 2010-10-18 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'ak/submodule-sync' into maint | Junio C Hamano | 2010-11-24 | 2 | -3/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | submodule sync: Update "submodule.<name>.url" for empty directories | Andreas Köhler | 2010-10-13 | 2 | -3/+14 | |
| |/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-rev-list-nul' into maint | Junio C Hamano | 2010-11-24 | 4 | -6/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | rev-list: handle %x00 NUL in user format | Jeff King | 2010-10-13 | 4 | -6/+16 | |
| |/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'cb/diff-fname-optim' into maint | Junio C Hamano | 2010-11-24 | 3 | -25/+124 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | diff: avoid repeated scanning while looking for funcname | René Scharfe | 2010-09-30 | 1 | -24/+14 | |
| * | | | | | | | | | | | | | | | | | | do not search functions for patch ID | Clemens Buchacher | 2010-09-23 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | add rebase patch id tests | Clemens Buchacher | 2010-09-23 | 1 | -0/+109 | |
| | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/no-textconv-symlink' into maint | Junio C Hamano | 2010-11-24 | 2 | -3/+34 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | diff: don't use pathname-based diff drivers for symlinks | Jeff King | 2010-09-23 | 2 | -3/+34 | |
| |/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'dk/maint-blame-el' into maint | Junio C Hamano | 2010-11-24 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | git-blame.el: Add (require 'format-spec) | David Kågedal | 2010-11-03 | 1 | -0/+1 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'aw/git-p4-deletion' into maint | Junio C Hamano | 2010-11-24 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Fix handling of git-p4 on deleted files | Andrew Waters | 2010-10-22 | 1 | -1/+3 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'kf/post-receive-sample-hook' into maint | Junio C Hamano | 2010-11-24 | 1 | -16/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | post-receive-email: ensure sent messages are not empty | Kevin P. Fleming | 2010-09-10 | 1 | -16/+31 |