summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | contrib/remote-helpers: style updates for test scriptsJunio C Hamano2013-09-034-226/+248
| * | | | | | | | | | | | | | | | | | | | | | | remote-hg: use notes to keep track of Hg revisionsFelipe Contreras2013-08-301-1/+34
| * | | | | | | | | | | | | | | | | | | | | | | remote-helpers: cleanup more global variablesFelipe Contreras2013-08-292-57/+2
| * | | | | | | | | | | | | | | | | | | | | | | remote-helpers: trivial style fixesFelipe Contreras2013-08-292-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | remote-hg: improve basic testFelipe Contreras2013-08-291-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | remote-hg: add missing &&s in the testFelipe Contreras2013-08-291-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | remote-hg: fix testFelipe Contreras2013-08-291-2/+0
| * | | | | | | | | | | | | | | | | | | | | | | remote-bzr: make bzr branches configurable per-repoFelipe Contreras2013-08-291-3/+10
| * | | | | | | | | | | | | | | | | | | | | | | remote-bzr: fix export of utf-8 authorsFelipe Contreras2013-08-292-0/+31
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/add-i-mingw'Junio C Hamano2013-09-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | add--interactive: fix external command invocation on Windowsjs/add-i-mingwJohannes Sixt2013-09-041-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ks/p4-view-spec'Junio C Hamano2013-09-182-165/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | git p4: implement view spec wildcards with "p4 where"ks/p4-view-specKazuki Saitoh2013-09-031-164/+59
| * | | | | | | | | | | | | | | | | | | | | | | git p4 test: sanitize P4CHARSETkazuki saitoh2013-08-111-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/duplicate-objects-in-packs'Junio C Hamano2013-09-185-3/+316
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | t5308: check that index-pack --strict detects duplicate objectsJeff King2013-09-041-0/+7
| * | | | | | | | | | | | | | | | | | | | | | | | test index-pack on packs with recoverable delta cyclesJeff King2013-08-241-0/+18
| * | | | | | | | | | | | | | | | | | | | | | | | add tests for indexing packs with delta cyclesJeff King2013-08-242-0/+81
| * | | | | | | | | | | | | | | | | | | | | | | | sha1-lookup: handle duplicate keys with GIT_USE_LOOKUPJeff King2013-08-243-0/+198
| * | | | | | | | | | | | | | | | | | | | | | | | test-sha1: add a binary output modeJeff King2013-08-221-3/+12
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/git-dir-pointing-at-gitfile'Junio C Hamano2013-09-182-5/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Make setup_git_env() resolve .git file when $GIT_DIR is not specifiednd/git-dir-pointing-at-gitfileNguyễn Thái Ngọc Duy2013-09-032-5/+8
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/pager-bypass-cat-for-default-pager'Junio C Hamano2013-09-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | pager: turn on "cat" optimization for DEFAULT_PAGERjk/pager-bypass-cat-for-default-pagerJeff King2013-09-031-1/+1
| | |_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fc/t3200-fixes'Junio C Hamano2013-09-181-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | t: branch: fix broken && chainsfc/t3200-fixesFelipe Contreras2013-09-031-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | t: branch: fix typoFelipe Contreras2013-09-031-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | t: branch: trivial style fixFelipe Contreras2013-09-031-1/+2
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fc/rev-parse-test-updates'Junio C Hamano2013-09-181-33/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | rev-parse test: use standard test functions for setupfc/rev-parse-test-updatesFelipe Contreras2013-09-031-9/+9
| * | | | | | | | | | | | | | | | | | | | | | | | | rev-parse test: use test_cmp instead of "test" builtinJonathan Nieder2013-09-031-14/+19
| * | | | | | | | | | | | | | | | | | | | | | | | | rev-parse test: use test_must_fail, not "if <command>; then false; fi"Felipe Contreras2013-09-031-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | rev-parse test: modernize quoting and whitespaceFelipe Contreras2013-09-031-16/+58
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.5 for the first half of the fourth batchJunio C Hamano2013-09-171-0/+22
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/remove-remote-helpers-in-python'Junio C Hamano2013-09-1716-1815/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | git_remote_helpers: remove little used Python libraryjk/remove-remote-helpers-in-pythonJohn Keeping2013-09-0916-1815/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ss/doclinks'Junio C Hamano2013-09-177-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: make AsciiDoc links always point to HTML filesss/doclinksSebastian Schuberth2013-09-067-10/+10
| |/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rh/ishes-doc'Junio C Hamano2013-09-1730-83/+118
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | glossary: fix and clarify the definition of 'ref'rh/ishes-docRichard Hansen2013-09-041-4/+14
| * | | | | | | | | | | | | | | | | | | | | | | | | | revisions.txt: fix and clarify <rev>^{<type>}Richard Hansen2013-09-041-4/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | glossary: more precise definition of tree-ish (a.k.a. treeish)Richard Hansen2013-09-041-3/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | use 'commit-ish' instead of 'committish'Richard Hansen2013-09-0423-63/+63
| * | | | | | | | | | | | | | | | | | | | | | | | | | use 'tree-ish' instead of 'treeish'Richard Hansen2013-09-046-8/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | glossary: define commit-ish (a.k.a. committish)Richard Hansen2013-09-041-0/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | glossary: mention 'treeish' as an alternative to 'tree-ish'Richard Hansen2013-09-041-1/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dw/diff-no-index-doc'Junio C Hamano2013-09-172-5/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | diff --no-index: describe in a separate paragraphdw/diff-no-index-docJunio C Hamano2013-08-281-5/+9
| * | | | | | | | | | | | | | | | | | | | | | | | | | diff --no-index: clarify operation when not inside a repositoryDale R. Worley2013-08-222-2/+15
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ta/user-manual'Junio C Hamano2013-09-171-79/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \