summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | Merge branch 'jk/test-with-x' into maintJunio C Hamano2015-08-261-2/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | test-lib: disable trace when test is not verboseJeff King2015-08-071-2/+6
| * | | | | | | | | | | | | | | | | | test-lib: turn off "-x" tracing during chain-lint checkJeff King2015-08-071-0/+5
* | | | | | | | | | | | | | | | | | | Merge branch 'sb/check-return-from-read-ref' into maintJunio C Hamano2015-08-261-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | transport-helper: die on errors reading refs.Stefan Beller2015-08-031-2/+6
* | | | | | | | | | | | | | | | | | | | Merge branch 'mm/pull-upload-pack' into maintJunio C Hamano2015-08-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | pull: pass upload_pack only when it was givenJunio C Hamano2015-08-261-1/+1
| * | | | | | | | | | | | | | | | | | | pull.sh: quote $upload_pack when passing it to git-fetchMatthieu Moy2015-07-301-1/+1
* | | | | | | | | | | | | | | | | | | | Start preparing for 2.5.1Junio C Hamano2015-08-192-1/+50
* | | | | | | | | | | | | | | | | | | | Merge branch 'ta/docfix-index-format-tech' into maintJunio C Hamano2015-08-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | typofix for index-format.txtThomas Ackermann2015-07-281-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/parse-options-codeformat' into maintJunio C Hamano2015-08-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | parse-options: align curly braces for all optionsStefan Beller2015-07-291-1/+1
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/remove-unused-var-from-builtin-add' into maintJunio C Hamano2015-08-191-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | add: remove dead codeStefan Beller2015-07-311-2/+0
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'kn/tag-doc-fix' into maintJunio C Hamano2015-08-191-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Documentation/tag: remove double occurance of "<pattern>"Karthik Nayak2015-07-101-1/+0
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/doc-clean-outdated-tools' into maintJunio C Hamano2015-08-192-117/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Documentation/git-tools: retire manually-maintained listEric Sunshine2015-07-281-81/+7
| * | | | | | | | | | | | | | | | | | | | | | Documentation/git-tools: drop references to defunct toolsEric Sunshine2015-07-281-31/+0
| * | | | | | | | | | | | | | | | | | | | | | Documentation/git-tools: fix item text formattingEric Sunshine2015-07-281-67/+67
| * | | | | | | | | | | | | | | | | | | | | | Documentation/git-tools: improve discoverability of Git wikiEric Sunshine2015-07-281-6/+3
| * | | | | | | | | | | | | | | | | | | | | | Documentation/git: drop outdated Cogito referenceEric Sunshine2015-07-251-1/+1
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/export-worktree' into maintJunio C Hamano2015-08-192-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIRNguyễn Thái Ngọc Duy2015-06-262-0/+19
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/fast-import-optimize-current-from' into maintJunio C Hamano2015-08-191-12/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | fast-import: do less work when given "from" matches current branch headMike Hommey2015-07-131-12/+17
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ib/scripted-parse-opt-better-hint-string' into maintJunio C Hamano2015-08-193-68/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | rev-parse --parseopt: allow [*=?!] in argument hintsIlya Bobyr2015-07-153-68/+92
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'se/doc-checkout-ours-theirs' into maintJunio C Hamano2015-08-191-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | checkout: document subtlety around --ours/--theirsSimon A. Eugster2015-07-121-0/+15
| | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/uname-in-untracked' into maintJunio C Hamano2015-08-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | untracked: fix detection of uname(2) failureCharles Bailey2015-07-171-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'as/sparse-checkout-removal' into maintJunio C Hamano2015-08-192-0/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | unpack-trees: don't update files with CE_WT_REMOVE setDavid Turner2015-07-212-0/+56
| | |_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'db/send-pack-user-signingkey' into maintJunio C Hamano2015-08-191-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | builtin/send-pack.c: respect user.signingkeyJunio C Hamano2015-07-221-0/+3
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jx/do-not-crash-receive-pack-wo-head' into maintJunio C Hamano2015-08-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | receive-pack: crash when checking with non-exist HEADJiang Xin2015-07-221-1/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/subtree-date-confusion' into maintJunio C Hamano2015-08-192-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | contrib/subtree: ignore log.date configurationDavid Aguilar2015-07-242-1/+5
| | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Sync with 2.4.8Junio C Hamano2015-08-033-4/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | / / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Git 2.4.8v2.4.8Junio C Hamano2015-08-034-5/+25
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maintJunio C Hamano2015-08-032-1/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ss/clone-guess-dir-name-simplify' into maintJunio C Hamano2015-08-031-13/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/completion-commit-cleanup' into maintJunio C Hamano2015-08-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/am-abort-fix' into maintJunio C Hamano2015-08-032-8/+104
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maintJunio C Hamano2015-08-033-7/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/commit-cleanup-scissors' into maintJunio C Hamano2015-08-032-5/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Git 2.5v2.5.0Junio C Hamano2015-07-272-1/+6