Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'ml/avoid-using-grep-on-crlf-files' | Junio C Hamano | 2013-07-24 |
|\ | |||
| * | test-lib.sh - define and use GREP_STRIPS_CR | Mark Levedahl | 2013-07-18 |
* | | Merge branch 'tr/line-log' | Junio C Hamano | 2013-07-24 |
|\ \ | |||
| * | | t4211: fix incorrect rebase at f8395edc (range-set: satisfy non-empty ranges ... | Junio C Hamano | 2013-07-24 |
| * | | line-log: fix "log -LN" crash when N is last line of file | Eric Sunshine | 2013-07-23 |
| * | | range-set: satisfy non-empty ranges invariant | Eric Sunshine | 2013-07-23 |
| * | | t4211: demonstrate crash when first -L encountered is empty range | Eric Sunshine | 2013-07-23 |
| * | | t4211: demonstrate empty -L range crash | Eric Sunshine | 2013-07-23 |
* | | | Merge branch 'mv/merge-ff-tristate' | Junio C Hamano | 2013-07-23 |
|\ \ \ | |||
| * | | | t7600: fix typo in test title | Junio C Hamano | 2013-07-23 |
* | | | | Sync with Git 1.8.3.4 | Junio C Hamano | 2013-07-22 |
|\ \ \ \ | |||
| * | | | | update URL to the marc.info mail archive | Ondřej Bílka | 2013-07-22 |
* | | | | | Merge branch 'jc/name-rev-exact-ref' | Junio C Hamano | 2013-07-22 |
|\ \ \ \ \ | |||
| * | | | | | describe: fix --contains when a tag is given as input | Junio C Hamano | 2013-07-18 |
| * | | | | | name-rev: differentiate between tags and commits they point at | Junio C Hamano | 2013-07-18 |
* | | | | | | Merge branch 'es/check-mailmap' | Junio C Hamano | 2013-07-22 |
|\ \ \ \ \ \ | |||
| * | | | | | | t4203: test check-mailmap command invocation | Eric Sunshine | 2013-07-13 |
* | | | | | | | Merge branch 'jx/clean-interactive' | Junio C Hamano | 2013-07-22 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | test: run testcases with POSIX absolute paths on Windows | Jiang Xin | 2013-06-26 |
| * | | | | | | | test: add t7301 for git-clean--interactive | Jiang Xin | 2013-06-26 |
| * | | | | | | | path.c: refactor relative_path(), not only strip prefix | Jiang Xin | 2013-06-26 |
| * | | | | | | | test: add test cases for relative_path | Jiang Xin | 2013-06-26 |
* | | | | | | | | Merge branch 'hv/config-from-blob' | Junio C Hamano | 2013-07-22 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | teach config --blob option to parse config from database | Heiko Voigt | 2013-07-12 |
* | | | | | | | | | Merge branch 'jk/t0008-sigpipe-fix' | Junio C Hamano | 2013-07-22 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | t0008: avoid SIGPIPE race condition on fifo | Jeff King | 2013-07-12 |
* | | | | | | | | | | Merge branch 'db/show-ref-head' | Junio C Hamano | 2013-07-22 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | show-ref: make --head always show the HEAD ref | Doug Bell | 2013-07-17 |
* | | | | | | | | | | | Merge branch 'es/blame-L-breakage' | Junio C Hamano | 2013-07-22 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | t8001/t8002 (blame): add blame -L :funcname tests | Eric Sunshine | 2013-07-17 |
| * | | | | | | | | | | | t8001/t8002 (blame): add blame -L tests | Eric Sunshine | 2013-07-17 |
| * | | | | | | | | | | | t8001/t8002 (blame): modernize style | Eric Sunshine | 2013-07-17 |
* | | | | | | | | | | | | Merge branch 'mm/diff-no-patch-synonym-to-s' | Junio C Hamano | 2013-07-22 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | diff: allow --patch & cie to override -s/--no-patch | Matthieu Moy | 2013-07-17 |
| * | | | | | | | | | | | | diff: allow --no-patch as synonym for -s | Matthieu Moy | 2013-07-17 |
| * | | | | | | | | | | | | t4000-diff-format.sh: modernize style | Matthieu Moy | 2013-07-17 |
* | | | | | | | | | | | | | Merge branch 'jc/mailmap-case-insensitivity' | Junio C Hamano | 2013-07-22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | mailmap: do not downcase mailmap entries | Junio C Hamano | 2013-07-15 |
| * | | | | | | | | | | | | | t4203: demonstrate loss of uppercase characters in canonical email | Eric Sunshine | 2013-07-15 |
| * | | | | | | | | | | | | | mailmap: do not lose single-letter names | Junio C Hamano | 2013-07-15 |
| * | | | | | | | | | | | | | t4203: demonstrate loss of single-character name in mailmap entry | Eric Sunshine | 2013-07-15 |
| |/ / / / / / / / / / / / | |||
* | | | | | | | | | | | | | Merge branch 'jc/simple-add-must-be-a-no-op' | Junio C Hamano | 2013-07-22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | t2202: make sure "git add" (no args) stays a no-op | Junio C Hamano | 2013-07-19 |
* | | | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2013-07-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | Merge branch 'dk/maint-t5150-dirname' into maint | Junio C Hamano | 2013-07-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-diff-core-safecrlf' into maint | Junio C Hamano | 2013-07-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | t9801: git-p4: check ignore files with client spec | Vitor Antunes | 2013-07-21 |
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | Merge branch 'tr/test-lint-no-export-assignment-in-shell' into maint | Junio C Hamano | 2013-07-19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/t1512-fix' into maint | Junio C Hamano | 2013-07-19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'vl/typofix' into maint | Junio C Hamano | 2013-07-19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |