Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ml/avoid-using-grep-on-crlf-files' | Junio C Hamano | 2013-07-24 | 3 | -2/+4 |
|\ | |||||
| * | test-lib.sh - define and use GREP_STRIPS_CRml/avoid-using-grep-on-crlf-files | Mark Levedahl | 2013-07-18 | 3 | -2/+4 |
* | | Merge branch 'jm/doc-ref-prune' | Junio C Hamano | 2013-07-24 | 2 | -3/+3 |
|\ \ | |||||
| * | | Documentation: fix git-prune example usagejm/doc-ref-prune | Jonathon Mah | 2013-07-18 | 1 | -1/+1 |
| * | | Documentation: remove --prune from pack-refs examples | Jonathon Mah | 2013-07-18 | 1 | -2/+2 |
* | | | Merge branch 'rh/template-updates' | Junio C Hamano | 2013-07-24 | 1 | -14/+13 |
|\ \ \ | |||||
| * | | | templates: spell ASCII in uppercase in pre-commit hookrh/template-updates | Richard Hartmann | 2013-07-15 | 1 | -3/+3 |
| * | | | templates: Reformat pre-commit hook's message | Richard Hartmann | 2013-07-15 | 1 | -4/+2 |
| * | | | templates: Use heredoc in pre-commit hook | Richard Hartmann | 2013-07-15 | 1 | -12/+13 |
* | | | | Merge branch 'mh/ref-races-optim-invalidate-cached' | Junio C Hamano | 2013-07-24 | 1 | -3/+6 |
|\ \ \ \ | |||||
| * | | | | refs: do not invalidate the packed-refs cache unnecessarily | Michael Haggerty | 2013-06-20 | 1 | -3/+6 |
* | | | | | Merge branch 'sb/misc-fixes' | Junio C Hamano | 2013-07-24 | 3 | -5/+2 |
|\ \ \ \ \ | |||||
| * | | | | | diff.c: Do not initialize a variable, which gets reassigned anyway.sb/misc-fixes | Stefan Beller | 2013-07-15 | 1 | -3/+1 |
| * | | | | | commit: Fix a memory leak in determine_author_info | Stefan Beller | 2013-07-15 | 1 | -1/+0 |
| * | | | | | daemon.c:handle: Remove unneeded check for null pointer. | Stefan Beller | 2013-07-15 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'tr/line-log' | Junio C Hamano | 2013-07-24 | 2 | -3/+19 |
|\ \ \ \ \ | |||||
| * | | | | | t4211: fix incorrect rebase at f8395edc (range-set: satisfy non-empty ranges ...tr/line-log | Junio C Hamano | 2013-07-24 | 1 | -1/+0 |
| * | | | | | Merge branch 'es/line-log-further-fixes' into tr/line-log | Junio C Hamano | 2013-07-23 | 3 | -7/+153 |
| |\ \ \ \ \ | |||||
| | * | | | | | line-log: fix "log -LN" crash when N is last line of filees/line-log-further-fixes | Eric Sunshine | 2013-07-23 | 2 | -1/+2 |
| | * | | | | | range-set: satisfy non-empty ranges invariant | Eric Sunshine | 2013-07-23 | 2 | -1/+4 |
| | * | | | | | t4211: demonstrate crash when first -L encountered is empty range | Eric Sunshine | 2013-07-23 | 1 | -0/+5 |
| | * | | | | | t4211: demonstrate empty -L range crash | Eric Sunshine | 2013-07-23 | 1 | -0/+8 |
| | * | | | | | range-set: fix sort_and_merge_range_set() corner case bug | Eric Sunshine | 2013-07-23 | 1 | -3/+3 |
* | | | | | | | open_istream: remove unneeded check for null pointer | Stefan Beller | 2013-07-23 | 1 | -1/+1 |
* | | | | | | | Merge branch 'mv/merge-ff-tristate' | Junio C Hamano | 2013-07-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t7600: fix typo in test titlemv/merge-ff-tristate | Junio C Hamano | 2013-07-23 | 1 | -1/+1 |
* | | | | | | | | Sync with Git 1.8.3.4 | Junio C Hamano | 2013-07-22 | 4 | -5/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Git 1.8.3.4v1.8.3.4 | Junio C Hamano | 2013-07-22 | 2 | -2/+3 |
| * | | | | | | | | update URL to the marc.info mail archive | Ondřej Bílka | 2013-07-22 | 3 | -4/+4 |
* | | | | | | | | | Update draft release notes to 1.8.4 | Junio C Hamano | 2013-07-22 | 1 | -0/+50 |
* | | | | | | | | | Merge branch 'jc/name-rev-exact-ref' | Junio C Hamano | 2013-07-22 | 3 | -32/+142 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | describe: fix --contains when a tag is given as inputjc/name-rev-exact-ref | Junio C Hamano | 2013-07-18 | 3 | -2/+30 |
| * | | | | | | | | | name-rev: differentiate between tags and commits they point at | Junio C Hamano | 2013-07-18 | 2 | -8/+28 |
| * | | | | | | | | | describe: use argv-array | Junio C Hamano | 2013-07-09 | 1 | -15/+15 |
| * | | | | | | | | | name-rev: allow converting the exact object name at the tip of a ref | Junio C Hamano | 2013-07-09 | 1 | -1/+58 |
| * | | | | | | | | | name-ref: factor out name shortening logic from name_ref() | Junio C Hamano | 2013-07-07 | 1 | -7/+12 |
* | | | | | | | | | | Merge branch 'rr/send-email-ssl-verify' | Junio C Hamano | 2013-07-22 | 3 | -3/+48 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | send-email: be explicit with SSL certificate verificationrr/send-email-ssl-verify | Ramkumar Ramachandra | 2013-07-18 | 3 | -3/+48 |
* | | | | | | | | | | | Merge branch 'es/check-mailmap' | Junio C Hamano | 2013-07-22 | 9 | -0/+162 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t4203: test check-mailmap command invocationes/check-mailmap | Eric Sunshine | 2013-07-13 | 1 | -0/+43 |
| * | | | | | | | | | | | builtin: add git-check-mailmap command | Eric Sunshine | 2013-07-13 | 8 | -0/+119 |
* | | | | | | | | | | | | Merge branch 'jx/clean-interactive' | Junio C Hamano | 2013-07-22 | 14 | -171/+1473 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | test: run testcases with POSIX absolute paths on Windows | Jiang Xin | 2013-06-26 | 2 | -21/+28 |
| * | | | | | | | | | | | | test: add t7301 for git-clean--interactive | Jiang Xin | 2013-06-26 | 1 | -0/+439 |
| * | | | | | | | | | | | | git-clean: add documentation for interactive git-clean | Jiang Xin | 2013-06-26 | 1 | -2/+63 |
| * | | | | | | | | | | | | git-clean: add ask each interactive action | Jiang Xin | 2013-06-26 | 1 | -0/+36 |
| * | | | | | | | | | | | | git-clean: add select by numbers interactive action | Jiang Xin | 2013-06-26 | 1 | -0/+39 |
| * | | | | | | | | | | | | git-clean: add filter by pattern interactive action | Jiang Xin | 2013-06-26 | 1 | -0/+68 |
| * | | | | | | | | | | | | git-clean: use a git-add-interactive compatible UI | Jiang Xin | 2013-06-26 | 1 | -29/+427 |
| * | | | | | | | | | | | | git-clean: add colors to interactive git-clean | Jiang Xin | 2013-06-26 | 2 | -9/+81 |