summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2015-08-28Git 2.5.1v2.5.1Junio C Hamano3-2/+19
2015-08-28Mingw: verify both ends of the pipe () callJose F. Morales1-1/+1
2015-08-25Merge branch 'jk/guess-repo-name-regression-fix' into maintJunio C Hamano2-1/+108
2015-08-25Merge branch 'jk/test-with-x' into maintJunio C Hamano1-2/+11
2015-08-25Merge branch 'sb/check-return-from-read-ref' into maintJunio C Hamano1-2/+6
2015-08-25Merge branch 'mm/pull-upload-pack' into maintJunio C Hamano1-1/+1
2015-08-25pull: pass upload_pack only when it was givenJunio C Hamano1-1/+1
2015-08-19Start preparing for 2.5.1Junio C Hamano2-1/+50
2015-08-19Merge branch 'ta/docfix-index-format-tech' into maintJunio C Hamano1-1/+1
2015-08-19Merge branch 'sb/parse-options-codeformat' into maintJunio C Hamano1-1/+1
2015-08-19Merge branch 'sb/remove-unused-var-from-builtin-add' into maintJunio C Hamano1-2/+0
2015-08-19Merge branch 'kn/tag-doc-fix' into maintJunio C Hamano1-1/+0
2015-08-19Merge branch 'es/doc-clean-outdated-tools' into maintJunio C Hamano2-117/+9
2015-08-19Merge branch 'nd/export-worktree' into maintJunio C Hamano2-0/+19
2015-08-19Merge branch 'mh/fast-import-optimize-current-from' into maintJunio C Hamano1-12/+17
2015-08-19Merge branch 'ib/scripted-parse-opt-better-hint-string' into maintJunio C Hamano3-68/+92
2015-08-19Merge branch 'se/doc-checkout-ours-theirs' into maintJunio C Hamano1-0/+15
2015-08-19Merge branch 'cb/uname-in-untracked' into maintJunio C Hamano1-1/+1
2015-08-19Merge branch 'as/sparse-checkout-removal' into maintJunio C Hamano2-0/+56
2015-08-19Merge branch 'db/send-pack-user-signingkey' into maintJunio C Hamano1-0/+3
2015-08-19Merge branch 'jx/do-not-crash-receive-pack-wo-head' into maintJunio C Hamano1-1/+1
2015-08-19Merge branch 'da/subtree-date-confusion' into maintJunio C Hamano2-1/+5
2015-08-10clone: use computed length in guess_dir_nameJeff King2-7/+8
2015-08-10clone: add tests for output directoryJeff King1-0/+106
2015-08-07test-lib: disable trace when test is not verboseJeff King1-2/+6
2015-08-07test-lib: turn off "-x" tracing during chain-lint checkJeff King1-0/+5
2015-08-03transport-helper: die on errors reading refs.Stefan Beller1-2/+6
2015-08-03Sync with 2.4.8Junio C Hamano3-4/+24
2015-08-03Git 2.4.8v2.4.8Junio C Hamano4-5/+25
2015-08-03Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maintJunio C Hamano2-1/+26
2015-08-03Merge branch 'ss/clone-guess-dir-name-simplify' into maintJunio C Hamano1-13/+6
2015-08-03Merge branch 'sg/completion-commit-cleanup' into maintJunio C Hamano1-1/+1
2015-08-03Merge branch 'pt/am-abort-fix' into maintJunio C Hamano2-8/+104
2015-08-03Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maintJunio C Hamano3-7/+83
2015-08-03Merge branch 'sg/commit-cleanup-scissors' into maintJunio C Hamano2-5/+28
2015-07-31add: remove dead codeStefan Beller1-2/+0
2015-07-30pull.sh: quote $upload_pack when passing it to git-fetchMatthieu Moy1-1/+1
2015-07-29parse-options: align curly braces for all optionsStefan Beller1-1/+1
2015-07-28Documentation/git-tools: retire manually-maintained listEric Sunshine1-81/+7
2015-07-28Documentation/git-tools: drop references to defunct toolsEric Sunshine1-31/+0
2015-07-28Documentation/git-tools: fix item text formattingEric Sunshine1-67/+67
2015-07-28Documentation/git-tools: improve discoverability of Git wikiEric Sunshine1-6/+3
2015-07-28typofix for index-format.txtThomas Ackermann1-1/+1
2015-07-27Git 2.5v2.5.0Junio C Hamano2-1/+6
2015-07-27Sync with 2.4.7Junio C Hamano2-1/+55
2015-07-27Git 2.4.7v2.4.7Junio C Hamano4-3/+57
2015-07-27Merge branch 'jk/pretty-encoding-doc' into maintJunio C Hamano1-1/+4
2015-07-27Merge branch 'tb/checkout-doc' into maintJunio C Hamano1-1/+5
2015-07-27Merge branch 'ls/hint-rev-list-count' into maintJunio C Hamano2-0/+2
2015-07-27Merge branch 'mm/branch-doc-updates' into maintJunio C Hamano1-2/+6
2015-07-27Merge branch 'jc/fsck-retire-require-eoh' into maintJunio C Hamano1-4/+13
2015-07-27Merge branch 'et/http-proxyauth' into maintJunio C Hamano1-2/+2
2015-07-27Merge branch 'jc/unexport-git-pager-in-use-in-pager' into maintJunio C Hamano1-0/+1
2015-07-27Merge branch 'mh/strbuf-read-file-returns-ssize-t' into maintJunio C Hamano2-3/+4
2015-07-27Merge branch 'kb/config-unmap-before-renaming' into maintJunio C Hamano1-0/+3
2015-07-27Merge branch 'jk/rev-list-no-bitmap-while-pruning' into maintJunio C Hamano2-1/+7
2015-07-27Merge branch 'rh/test-color-avoid-terminfo-in-original-home' into maintJunio C Hamano1-52/+47
2015-07-27Merge branch 'jk/fix-refresh-utime' into maintJunio C Hamano1-1/+9
2015-07-27Merge branch 'cb/rebase-am-exit-code' into maintJunio C Hamano1-1/+1
2015-07-27Merge branch 'jk/index-pack-reduce-recheck' into maintJunio C Hamano3-3/+14
2015-07-25Documentation/git: drop outdated Cogito referenceEric Sunshine1-1/+1
2015-07-24RelNotes: am.threeWay does not exist (yet)Junio C Hamano1-2/+0
2015-07-24Revert "git-am: add am.threeWay config variable"Junio C Hamano4-41/+2
2015-07-23contrib/subtree: ignore log.date configurationDavid Aguilar2-1/+5
2015-07-22receive-pack: crash when checking with non-exist HEADJiang Xin1-1/+1
2015-07-21builtin/send-pack.c: respect user.signingkeyJunio C Hamano1-0/+3
2015-07-21Git 2.5.0-rc3v2.5.0-rc3Junio C Hamano1-1/+1
2015-07-21unpack-trees: don't update files with CE_WT_REMOVE setDavid Turner2-0/+56
2015-07-21Merge branch 'tf/gitweb-typofix'Junio C Hamano1-1/+1
2015-07-21Merge tag 'l10n-2.5.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano9-2680/+3179
2015-07-20l10n: ca.po: update translationAlex Henrie1-187/+204
2015-07-17untracked: fix detection of uname(2) failureCharles Bailey1-1/+1
2015-07-17Merge branch 'jk/still-interesting'Junio C Hamano1-2/+2
2015-07-17Merge branch 'es/worktree-add'Junio C Hamano2-5/+6
2015-07-17Documentation/git: fix stale "MULTIPLE CHECKOUT MODE" referenceEric Sunshine1-1/+1
2015-07-16worktree: caution that this is still experimentalJunio C Hamano1-2/+3
2015-07-16Documentation/git-worktree: fix stale "git checkout --to" referencesEric Sunshine1-2/+2
2015-07-16Merge branch 'master' of https://github.com/ralfth/git-po-deJiang Xin1-199/+241
2015-07-15Sync with 2.4.6Junio C Hamano2-1/+25
2015-07-15Git 2.4.6v2.4.6Junio C Hamano4-3/+27
2015-07-15Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano1-1/+6
2015-07-15Merge branch 'mm/describe-doc' into maintJunio C Hamano1-1/+1
2015-07-15Merge branch 'jc/prompt-document-ps1-state-separator' into maintJunio C Hamano1-0/+4
2015-07-15Merge branch 'es/osx-header-pollutes-mask-macro' into maintJunio C Hamano4-29/+29
2015-07-15Merge branch 'es/utf8-stupid-compiler-workaround' into maintJunio C Hamano1-1/+3
2015-07-15Merge branch 'fk/doc-format-patch-vn' into maintJunio C Hamano1-1/+1
2015-07-15Merge branch 'pt/t0302-needs-sanity' into maintJunio C Hamano1-1/+1
2015-07-15Merge branch 'me/fetch-into-shallow-safety' into maintJunio C Hamano1-1/+1
2015-07-15Merge branch 'mh/fsck-reflog-entries' into maintJunio C Hamano1-14/+20
2015-07-15Merge branch 'af/tcsh-completion-noclobber' into maintJunio C Hamano1-1/+1
2015-07-15Merge branch 'pa/auto-gc-mac-osx' into maintJunio C Hamano1-1/+1
2015-07-15Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maintJunio C Hamano2-6/+14
2015-07-15l10n: de.po: translate 9 new messagesRalf Thielow1-199/+241
2015-07-15l10n: Updated Bulgarian translation of git (2359t,0f,0u)Alexander Shopov1-190/+208
2015-07-15rev-parse --parseopt: allow [*=?!] in argument hintsIlya Bobyr3-68/+92
2015-07-15l10n: zh_CN: for git v2.5.0 l10n round 2Jiang Xin1-199/+201
2015-07-15l10n: sv.po: Update Swedish translation (2359t0f0u)Peter Krefting1-186/+216
2015-07-15Merge branch 'fr_v2.5.0-round2' of git://github.com/jnavila/gitJiang Xin1-199/+252
2015-07-14l10n: fr v2.5.0 round 2 (2359t)Jean-Noel Avila1-199/+252
2015-07-14Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin1-1120/+1411
2015-07-14l10n: ru.po: update Russian translationDimitriy Ryazantcev1-1120/+1411
2015-07-14l10n: Updated Vietnamese translation (2359t)Tran Ngoc Quan1-218/+247
2015-07-14l10n: git.pot: v2.5.0 round 2 (9 new, 5 removed)Jiang Xin1-182/+199
2015-07-13Merge tag 'l10n-2.5.0-rnd1' of git://github.com/git-l10n/git-poJunio C Hamano8-9106/+11110
2015-07-13Git 2.5.0-rc2v2.5.0-rc2Junio C Hamano2-3/+45
2015-07-13Merge branch 'es/worktree-add'Junio C Hamano8-260/+386
2015-07-13Merge branch 'nd/multiple-work-trees'Junio C Hamano13-126/+217
2015-07-13Merge branch 'ss/clone-guess-dir-name-simplify'Junio C Hamano1-13/+6
2015-07-13Merge branch 'kb/config-unmap-before-renaming'Junio C Hamano1-0/+3
2015-07-13Merge branch 'mh/strbuf-read-file-returns-ssize-t'Junio C Hamano2-3/+4
2015-07-13Merge branch 'jc/unexport-git-pager-in-use-in-pager'Junio C Hamano1-0/+1
2015-07-13Merge branch 'kb/use-nsec-doc'Junio C Hamano2-6/+11
2015-07-13Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip'Junio C Hamano2-1/+26
2015-07-13Merge branch 'et/http-proxyauth'Junio C Hamano1-2/+2
2015-07-13Merge branch 'jc/fsck-retire-require-eoh'Junio C Hamano1-4/+13
2015-07-13fast-import: do less work when given "from" matches current branch headMike Hommey1-12/+17
2015-07-12diff: parse ws-error-highlight option more strictlyRené Scharfe1-1/+6
2015-07-12Revert "checkout: retire --ignore-other-worktrees in favor of --force"Junio C Hamano3-7/+12
2015-07-12checkout: document subtlety around --ours/--theirsSimon A. Eugster1-0/+15
2015-07-10The last minute bits of fixesJunio C Hamano1-0/+21
2015-07-10Merge branch 'cb/rebase-am-exit-code'Junio C Hamano1-1/+1
2015-07-10Merge branch 'jk/fix-refresh-utime'Junio C Hamano1-1/+9
2015-07-10Merge branch 'mm/branch-doc-updates'Junio C Hamano1-2/+6
2015-07-10Merge branch 'ls/hint-rev-list-count'Junio C Hamano2-0/+2
2015-07-10Merge branch 'jk/rev-list-no-bitmap-while-pruning'Junio C Hamano2-1/+7
2015-07-10Merge branch 'cb/subtree-tests-update'Junio C Hamano1-152/+150
2015-07-10Merge branch 'rh/test-color-avoid-terminfo-in-original-home'Junio C Hamano1-52/+47
2015-07-10Merge branch 'sb/p5310-and-chain'Junio C Hamano1-3/+3
2015-07-10Merge branch 'tb/checkout-doc'Junio C Hamano1-1/+5
2015-07-10Merge branch 'jk/pretty-encoding-doc'Junio C Hamano1-1/+4
2015-07-10Merge branch 'nd/dwim-wildcards-as-pathspecs'Junio C Hamano1-0/+26
2015-07-10Documentation/tag: remove double occurance of "<pattern>"Karthik Nayak1-1/+0
2015-07-09Merge branch 'jk/maint-for-each-packed-object'Junio C Hamano2-1/+7
2015-07-09Merge branch 'jc/fix-alloc-sortbuf-in-index-pack'Junio C Hamano1-8/+8
2015-07-09clone: simplify string handling in guess_dir_name()Sebastian Schuberth1-13/+6
2015-07-08check_and_freshen_file: fix reversed success-checkJeff King1-1/+9
2015-07-08rebase: return non-zero error code if format-patch failsClemens Buchacher1-1/+1
2015-07-08l10n: de.po: translate 65 new messagesRalf Thielow1-1132/+1391
2015-07-08l10n: de.po: translate "index" as "Index"Ralf Thielow1-69/+65
2015-07-08l10n: de.po: fix translation of "head nodes"Ralf Thielow1-2/+2
2015-07-07checkout: retire --ignore-other-worktrees in favor of --forceEric Sunshine3-12/+7
2015-07-07worktree: add: auto-vivify new branch when <branch> is omittedEric Sunshine3-4/+26
2015-07-06worktree: add: make -b/-B default to HEAD when <branch> is omittedEric Sunshine3-2/+10
2015-07-06worktree: extract basename computation to new functionEric Sunshine1-9/+20
2015-07-06checkout: require worktree unconditionallyEric Sunshine2-3/+1
2015-07-06checkout: retire --to optionEric Sunshine3-173/+139
2015-07-06tests: worktree: retrofit "checkout --to" tests for "worktree add"Eric Sunshine3-29/+25
2015-07-06worktree: add -b/-B optionsEric Sunshine2-3/+21
2015-07-06worktree: add --detach optionEric Sunshine2-2/+9
2015-07-06worktree: add --force optionEric Sunshine2-2/+12
2015-07-06worktree: introduce "add" commandEric Sunshine2-10/+41
2015-07-06checkout: drop 'checkout_opts' dependency from prepare_linked_checkoutEric Sunshine1-4/+5
2015-07-06checkout: make --to unconditionally verboseEric Sunshine1-2/+1
2015-07-06checkout: prepare_linked_checkout: drop now-unused 'new' argumentEric Sunshine1-3/+2
2015-07-06checkout: relocate --to's "no branch specified" checkEric Sunshine1-3/+4
2015-07-06checkout: fix bug with --to and relative HEADEric Sunshine2-4/+22
2015-07-06Documentation/git-worktree: add EXAMPLES sectionEric Sunshine1-0/+22
2015-07-06Documentation/git-worktree: add high-level 'lock' overviewEric Sunshine1-9/+15
2015-07-06Documentation/git-worktree: split technical info from general descriptionEric Sunshine1-34/+36
2015-07-06Documentation/git-worktree: add BUGS sectionEric Sunshine1-3/+16
2015-07-06Documentation: move linked worktree description from checkout to worktreeEric Sunshine2-67/+64
2015-07-06Documentation/git-worktree: associate options with commandsEric Sunshine1-3/+3
2015-07-06Documentation/git-checkout: fix incorrect worktree prune commandEric Sunshine1-1/+1
2015-07-06Documentation/branch: document -M and -D in terms of --forceMatthieu Moy1-2/+2
2015-07-06Documentation/branch: document -d --force and -m --forceMatthieu Moy1-0/+4
2015-07-06git-multimail: update to release 1.1.1Matthieu Moy4-6/+17
2015-07-05l10n: zh_CN: for git v2.5.0 l10n round 1Jiang Xin1-1122/+1381
2015-07-04index-pack: fix allocation of sorted_by_pos arrayJunio C Hamano1-8/+8
2015-07-03strbuf: strbuf_read_file() should return ssize_tMichael Haggerty2-3/+4
2015-07-03pager: do not leak "GIT_PAGER_IN_USE" to the pagerJunio C Hamano1-0/+1
2015-07-01l10n: ca.po: update translationAlex Henrie1-1127/+1382
2015-07-02Merge branch 'fr_2.5.0_round1' of git://github.com/jnavila/gitJiang Xin1-1131/+1379
2015-07-01Makefile / racy-git.txt: clarify USE_NSEC prerequisitesKarsten Blees2-6/+11
2015-07-01Git 2.5.0-rc1v2.5.0-rc1Junio C Hamano2-1/+8
2015-07-01Merge branch 'me/fetch-into-shallow-safety'Junio C Hamano1-1/+1
2015-07-01Merge branch 'jc/prompt-document-ps1-state-separator'Junio C Hamano1-0/+4
2015-07-01Merge branch 'mm/describe-doc'Junio C Hamano1-1/+1
2015-07-01Merge branch 'da/mergetool-winmerge'Junio C Hamano1-0/+1
2015-07-01rev-list: disable --use-bitmap-index when pruning commitsJeff King2-1/+7
2015-07-01Add tests for wildcard "path vs ref" disambiguationNguyễn Thái Ngọc Duy1-0/+26
2015-07-01rev-list: add --count to usage guideLawrence Siebert2-0/+2
2015-06-30l10n: fr.po v2.5.0-rc0 (2355t)Jean-Noel Avila1-1131/+1379
2015-06-30config.c: fix writing config files on Windows network sharesKarsten Blees1-0/+3
2015-06-29rebase -i: do not leave a CHERRY_PICK_HEAD file behindJohannes Schindelin2-2/+6
2015-06-29t3404: demonstrate CHERRY_PICK_HEAD bugJohannes Schindelin1-0/+21
2015-06-29http: always use any proxy auth method availableEnrique Tobis1-2/+2
2015-06-29revision.c: remove unneeded check for NULLStefan Beller1-2/+2
2015-06-29worktree: new place for "git prune --worktrees"Nguyễn Thái Ngọc Duy11-114/+198
2015-06-29Merge branch 'master' of git://github.com/alshopov/git-poJiang Xin1-1158/+1401
2015-06-28Sync with maintJunio C Hamano0-0/+0
2015-06-28fsck: it is OK for a tag and a commit to lack the bodyJunio C Hamano1-4/+13
2015-06-28l10n: Updated Bulgarian translation of git (2355t,0f,0u)Alexander Shopov1-1158/+1401
2015-06-28l10n: sv.po: Update Swedish translation (2355t0f0u)Peter Krefting1-1129/+1387
2015-06-28l10n: Updated Vietnamese translation (2355t)Tran Ngoc Quan1-1132/+1382
2015-06-27l10n: git.pot: v2.5.0 round 1 (65 new, 15 removed)Jiang Xin1-1108/+1344
2015-06-26p5310: Fix broken && chain in performance testStefan Beller1-3/+3
2015-06-26setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIRNguyễn Thái Ngọc Duy2-0/+19
2015-06-25Merge branch 'jk/stash-require-clean-index' into maintJunio C Hamano2-9/+0
2015-06-25Merge branch 'cb/array-size' into maintJunio C Hamano1-5/+3
2015-06-25Git 2.5.0-rc0v2.5.0-rc0Junio C Hamano2-16/+3