summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2014-04-09Git 1.9.2v1.9.2Junio C Hamano3-2/+23
2014-04-09Merge branch 'jl/nor-or-nand-and' into maintJunio C Hamano57-90/+88
2014-04-09Merge branch 'cn/fetch-prune-overlapping-destination' into maintJunio C Hamano2-6/+64
2014-04-09Merge branch 'mh/update-ref-batch-create-fix' into maintJunio C Hamano2-0/+12
2014-04-09Merge branch 'jk/commit-dates-parsing-fix' into maintJunio C Hamano5-4/+47
2014-04-09Merge branch 'jc/fix-diff-no-index-diff-opt-parse' into maintJunio C Hamano1-1/+1
2014-04-09Merge commit 'doc/http-backend: missing accent grave in literal mark-up'Junio C Hamano1-1/+1
2014-04-09doc/http-backend: missing accent grave in literal mark-upThomas Ackermann1-1/+1
2014-04-08Update draft release notes to 1.9.2Junio C Hamano1-0/+9
2014-04-08Merge branch 'mm/status-porcelain-format-i18n-fix' into maintJunio C Hamano2-5/+9
2014-04-08Merge branch 'bp/commit-p-editor' into maintJunio C Hamano10-39/+137
2014-04-03Start preparing for 1.9.1Junio C Hamano2-1/+39
2014-04-03Merge branch 'jk/mv-submodules-fix' into maintJunio C Hamano2-1/+21
2014-04-03Merge branch 'mh/remove-subtree-long-pathname-fix' into maintJunio C Hamano1-32/+32
2014-04-03Merge branch 'jk/lib-terminal-lazy' into maintJunio C Hamano1-18/+19
2014-04-03Merge branch 'nd/index-pack-error-message' into maintJunio C Hamano1-2/+2
2014-04-03Merge branch 'us/printf-not-echo' into maintJunio C Hamano2-3/+3
2014-04-03Merge branch 'rr/doc-merge-strategies' into maintJunio C Hamano1-2/+2
2014-04-03Merge branch 'jk/shallow-update-fix' into maintJunio C Hamano5-56/+49
2014-04-03Merge branch 'jc/stash-pop-not-popped' into maintJunio C Hamano1-2/+8
2014-04-03Merge branch 'jn/wt-status' into maintJunio C Hamano3-55/+88
2014-04-02update-ref: fail create operation over stdin if ref already existsAman Gupta2-0/+12
2014-04-01t4212: loosen far-in-future test for AIXJeff King1-4/+2
2014-04-01date: recognize bogus FreeBSD gmtime outputJeff King4-0/+45
2014-03-31code and test: fix misuses of "nor"Justin Lebar12-16/+16
2014-03-31comments: fix misuses of "nor"Justin Lebar20-27/+26
2014-03-31contrib: fix misuses of "nor"Justin Lebar2-3/+3
2014-03-31Documentation: fix misuses of "nor"Justin Lebar25-44/+43
2014-03-31diff-no-index: correctly diagnose error return from diff_opt_parse()Junio C Hamano1-1/+1
2014-03-26fetch: handle overlaping refspecs on --pruneCarlos Martín Nieto2-7/+45
2014-03-26status: disable translation when --porcelain is usedMatthieu Moy2-5/+9
2014-03-18Git 1.9.1v1.9.1Junio C Hamano4-3/+63
2014-03-18Merge branch 'jk/clean-d-pathspec' into maintJunio C Hamano2-11/+25
2014-03-18Merge branch 'da/difftool-git-files' into maintJunio C Hamano2-16/+16
2014-03-18Merge branch 'jk/remote-pushremote-config-reading' into maintJunio C Hamano2-1/+19
2014-03-18Merge branch 'jk/commit-dates-parsing-fix' into maintJunio C Hamano6-11/+96
2014-03-18Merge branch 'tr/diff-submodule-no-reuse-worktree' into maintJunio C Hamano2-3/+32
2014-03-18Merge branch 'nd/reset-setup-worktree' into maintJunio C Hamano2-3/+15
2014-03-18Merge branch 'jc/check-attr-honor-working-tree' into maintJunio C Hamano2-22/+43
2014-03-18Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maintJunio C Hamano4-14/+70
2014-03-18Merge branch 'ds/rev-parse-required-args' into maintJunio C Hamano1-6/+11
2014-03-18Merge branch 'jk/config-path-include-fix' into maintJunio C Hamano2-2/+6
2014-03-18Merge branch 'nd/diff-quiet-stat-dirty' into maintJunio C Hamano3-24/+51
2014-03-18Merge branch 'nd/http-fetch-shallow-fix' into maintJunio C Hamano12-37/+105
2014-03-18Merge branch 'nd/submodule-pathspec-ending-with-slash' into maintJunio C Hamano22-76/+89
2014-03-18test-lib.sh: do not "echo" caller-supplied stringsUwe Storbeck1-2/+2
2014-03-18run-command: mark run_hook_with_custom_index as deprecatedBenoit Pierre1-0/+1
2014-03-18merge hook tests: fix and update testsBenoit Pierre1-6/+21
2014-03-18merge: fix GIT_EDITOR override for commit hookBenoit Pierre1-1/+1
2014-03-18commit: fix patch hunk editing with "commit -p -m"Benoit Pierre9-32/+80
2014-03-18test patch hunk editing with "commit -p -m"Benoit Pierre1-0/+34
2014-03-17Documentation/merge-strategies: avoid hyphenated commandsRamkumar Ramachandra1-2/+2
2014-03-17index-pack: report error using the correct variableJunio C Hamano1-2/+2
2014-03-17shallow: verify shallow file after taking lockJeff King1-2/+2
2014-03-17rebase -i: do not "echo" random user-supplied stringsUwe Storbeck1-1/+1
2014-03-17mv: prevent mismatched data when ignoring errors.brian m. carlson2-1/+17
2014-03-14t/lib-terminal: make TTY a lazy prerequisiteJeff King1-18/+19
2014-03-13entry.c: fix possible buffer overflow in remove_subtree()Michael Haggerty1-17/+17
2014-03-13checkout_entry(): use the strbuf throughout the functionMichael Haggerty1-16/+16
2014-03-12wt-status: lift the artificual "at least 20 columns" floorJunio C Hamano3-15/+13
2014-03-12wt-status: i18n of section labelsJonathan Nieder1-19/+47
2014-03-12wt-status: extract the code to compute width for labelsJonathan Nieder1-7/+15
2014-03-12wt-status: make full label string to be subject to l10nJunio C Hamano1-18/+17
2014-03-11builtin/mv: fix out of bounds writeJohn Keeping1-0/+4
2014-03-11merge hook tests: use 'test_must_fail' instead of '!'Benoit Pierre1-2/+2
2014-03-11merge hook tests: fix missing '&&' in testBenoit Pierre1-1/+1
2014-03-11clean: simplify dir/not-dir logicJeff King1-9/+6
2014-03-11clean: respect pathspecs with "-d"Jeff King2-2/+19
2014-03-07show_ident_date: fix tz range checkJeff King1-2/+2
2014-03-05t7800: add a difftool test for .git-filesJunio C Hamano1-0/+14
2014-03-05i18n: proposed command missing leading dashSandy Carter1-2/+2
2014-02-28fetch: add a failing test for prunning with overlapping refspecsCarlos Martín Nieto1-0/+20
2014-02-27shallow: automatically clean up shallow tempfilesJeff King5-37/+40
2014-02-27shallow: use stat_validity to check for up-to-date fileJeff King1-17/+7
2014-02-26stash pop: mention we did not drop the stash upon failing to applyJunio C Hamano1-2/+8
2014-02-24diff: do not quit early on stat-dirty filesNguyễn Thái Ngọc Duy3-5/+25
2014-02-24diff.c: move diffcore_skip_stat_unmatch core logic out for reuse laterNguyễn Thái Ngọc Duy1-21/+28
2014-02-24clean: use cache_name_is_other()Nguyễn Thái Ngọc Duy1-19/+2
2014-02-24clean: replace match_pathspec() with dir_path_match()Nguyễn Thái Ngọc Duy1-2/+1
2014-02-24pathspec: pass directory indicator to match_pathspec_item()Nguyễn Thái Ngọc Duy6-9/+20
2014-02-24match_pathspec: match pathspec "foo/" against directory "foo"Nguyễn Thái Ngọc Duy1-1/+6
2014-02-24dir.c: prepare match_pathspec_item for taking more flagsNguyễn Thái Ngọc Duy1-6/+13
2014-02-24pathspec: rename match_pathspec_depth() to match_pathspec()Nguyễn Thái Ngọc Duy7-25/+27
2014-02-24pathspec: convert some match_pathspec_depth() to dir_path_match()Nguyễn Thái Ngọc Duy5-8/+12
2014-02-24pathspec: convert some match_pathspec_depth() to ce_path_match()Nguyễn Thái Ngọc Duy14-22/+24
2014-02-24merge-recursive.c: tolerate missing files while refreshing indexBrad King2-2/+3
2014-02-24read-cache.c: extend make_cache_entry refresh flag with optionsBrad King3-12/+16
2014-02-24read-cache.c: refactor --ignore-missing implementationBrad King2-3/+7
2014-02-24t3030-merge-recursive: test known breakage with empty work treeBrad King1-0/+47
2014-02-24remote: handle pushremote config in any orderJeff King2-1/+19
2014-02-24log: do not segfault on gmtime errorsJeff King2-2/+12
2014-02-24log: handle integer overflow in timestampsJeff King2-2/+24
2014-02-24date: check date overflow against time_tJeff King3-1/+19
2014-02-24fsck: report integer overflow in author timestampsJeff King2-6/+20
2014-02-24t4212: test bogus timestamps with git-logJeff King1-0/+21
2014-02-24difftool: support repositories with .git-filesDavid Aguilar1-16/+2
2014-02-18reset: optionally setup worktree and refresh index on --mixedNguyễn Thái Ngọc Duy2-3/+15
2014-02-18diff: do not reuse_worktree_file for submodulesThomas Rast2-3/+32
2014-02-14Git 1.9.0v1.9.0Junio C Hamano4-33/+11
2014-02-14release notes: typo fixesMichael J Gruber1-18/+18
2014-02-13Sync with 1.8.5.5Junio C Hamano3-2/+40
2014-02-13Git 1.8.5.5v1.8.5.5Junio C Hamano5-4/+42
2014-02-13Merge branch 'bm/merge-base-octopus-dedup' into maintJunio C Hamano2-6/+64
2014-02-13Merge branch 'jc/revision-range-unpeel' into maintJunio C Hamano2-12/+33
2014-02-13Merge branch 'jk/allow-fetch-onelevel-refname' into maintJunio C Hamano2-1/+12
2014-02-13Merge branch 'jk/interpret-branch-name-fix' into maintJunio C Hamano3-45/+124
2014-02-13Merge branch 'rk/send-email-ssl-cert' into maintJunio C Hamano1-1/+2
2014-02-13Merge branch 'sb/repack-in-c' into maintJunio C Hamano1-12/+12
2014-02-13Merge branch 'as/tree-walk-fix-aggressive-short-cut' into maintJunio C Hamano2-1/+14
2014-02-13t5537: move http tests out to t5539Nguyễn Thái Ngọc Duy2-57/+82
2014-02-12Merge git://github.com/git-l10n/git-poJunio C Hamano1-844/+966
2014-02-12l10n: de.po: correct message when hiding commits by craftRalf Thielow1-1/+1
2014-02-12l10n: de.po: translate 28 new messagesRalf Thielow1-843/+965
2014-02-11Merge git://github.com/git-l10n/git-poJunio C Hamano5-139/+165
2014-02-10fetch-pack: fix deepen shallow over smart http with no-done capNguyễn Thái Ngọc Duy2-1/+32
2014-02-10protocol-capabilities.txt: document no-doneNguyễn Thái Ngọc Duy1-0/+12
2014-02-10protocol-capabilities.txt: refer multi_ack_detailed back to pack-protocol.txtNguyễn Thái Ngọc Duy1-0/+6
2014-02-10pack-protocol.txt: clarify 'obj-id' in the last ACK after 'done'Nguyễn Thái Ngọc Duy1-1/+2
2014-02-10test: rename http fetch and push test filesNguyễn Thái Ngọc Duy4-0/+0
2014-02-10tests: auto-set LIB_HTTPD_PORT from test nameJeff King8-8/+1
2014-02-07Git 1.9.0-rc3v1.9.0-rc3Junio C Hamano1-1/+1
2014-02-07Merge branch 'ow/manpages-typofix'Junio C Hamano6-7/+7
2014-02-07Merge branch 'aj/ada-diff-word-pattern'Junio C Hamano2-3/+3
2014-02-07Merge branch 'nd/tag-doc'Junio C Hamano1-2/+3
2014-02-06check-attr: move to the top of working tree when in non-bare repositoryJunio C Hamano2-0/+13
2014-02-06t0003: do not chdir the whole test processJunio C Hamano1-22/+30
2014-02-06l10n: zh_CN.po: Disambiguation for rebaseJiang Xin1-28/+29
2014-02-05Documentation: fix typos in man pagesØystein Walle6-7/+7
2014-02-05Sync with 1.8.5.4Junio C Hamano2-1/+50
2014-02-05howto/maintain-git.txt: new version numbering schemeJunio C Hamano1-7/+11
2014-02-05Git 1.8.5.4v1.8.5.4Junio C Hamano4-3/+52
2014-02-05Merge branch 'jc/maint-pull-docfix' into maintJunio C Hamano2-5/+8
2014-02-05Merge branch 'ow/stash-with-ifs' into maintJunio C Hamano2-7/+19
2014-02-05Merge branch 'js/lift-parent-count-limit' into maintJunio C Hamano4-10/+45
2014-02-05Merge branch 'nd/add-empty-fix' into maintJunio C Hamano2-1/+20
2014-02-05Merge branch 'bc/log-decoration' into maintJunio C Hamano2-0/+17
2014-02-05Merge branch 'jh/rlimit-nofile-fallback' into maintJunio C Hamano1-7/+30
2014-02-05Merge branch 'jl/commit-v-strip-marker' into maintJunio C Hamano4-9/+58
2014-02-05Merge branch 'tr/send-email-ssl' into maintJunio C Hamano1-2/+6
2014-02-05Merge branch 'tb/clone-ssh-with-colon-for-port' into maintJunio C Hamano7-147/+350
2014-02-05Merge branch 'nd/transport-positive-depth-only' into maintJunio C Hamano2-0/+8
2014-02-05Merge branch 'tb/repack-fix-renames' (early part)Junio C Hamano1-2/+2
2014-02-05repack.c: rename and unlink pack file if it existsTorsten Bögershausen1-2/+2
2014-02-05userdiff: update Ada patternsAdrian Johnson2-3/+3
2014-02-04git-tag.txt: <commit> for --contains is optionalNguyễn Thái Ngọc Duy1-2/+3
2014-02-03l10n: zh_CN.po: translate 1 new message (2211t0f0u)Jiang Xin1-2/+6
2014-02-03Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin1-13/+18
2014-02-03Merge branch 'master' of git://github.com/vnwildman/gitJiang Xin1-62/+61
2014-02-03l10n: vi.po (2211t): Updated one new stringTran Ngoc Quan1-62/+61
2014-02-02l10n: Update Swedish translation (2211t0f0u)Peter Krefting1-13/+18
2014-02-02l10n: fr: 1.9rc2 2211tJean-Noel Avila1-23/+35
2014-02-01l10n: git.pot: v1.9 round 2 (1 new)Jiang Xin1-12/+17
2014-01-31Git 1.9-rc2v1.9-rc2Junio C Hamano1-1/+1
2014-01-31Merge git://github.com/git-l10n/git-poJunio C Hamano9-11470/+15408
2014-01-31Merge branch 'jn/pager-lv-default-env'Junio C Hamano1-1/+1
2014-01-31pager test: make fake pager consume all its inputJonathan Nieder1-1/+1
2014-01-29l10n: Bulgarian translation of git (222t21f1967u)Alexander Shopov1-0/+10404
2014-01-28rev-parse: check i before using argv[i] against argcDavid Sharp1-6/+11
2014-01-28handle_path_include: don't look at NULL valueJeff King1-1/+5
2014-01-28expand_user_path: do not look at NULL pathJeff King1-1/+1
2014-01-28po/TEAMS: Added Bulgarian teamAlexander Shopov1-0/+4
2014-01-27Git 1.9-rc1v1.9-rc1Junio C Hamano2-1/+47
2014-01-27Merge branch 'as/tree-walk-fix-aggressive-short-cut'Junio C Hamano2-1/+14
2014-01-27Merge branch 'ta/doc-http-protocol-in-html'Junio C Hamano2-114/+121
2014-01-27Merge branch 'mh/doc-wo-names'Junio C Hamano6-40/+0
2014-01-27Merge branch 'jk/revision-o-is-in-libgit-a'Junio C Hamano1-2/+2
2014-01-27Merge branch 'sb/repack-in-c'Junio C Hamano1-12/+12
2014-01-27Merge branch 'jk/test-fixes'Junio C Hamano2-1/+2
2014-01-27Merge branch 'nd/negative-pathspec'Junio C Hamano2-1/+18
2014-01-27Merge branch 'pw/git-p4'Junio C Hamano10-44/+342
2014-01-27Merge branch 'ss/safe-create-leading-dir-with-slash'Junio C Hamano1-4/+8
2014-01-27Merge branch 'mh/safe-create-leading-directories'Junio C Hamano6-67/+155
2014-01-27Merge branch 'tr/nth-previous-is-a-commit'Junio C Hamano2-3/+3
2014-01-27Merge branch 'tr/gitk-doc-range-trace'Junio C Hamano1-0/+16
2014-01-27Merge branch 'jk/mark-edges-uninteresting'Junio C Hamano2-9/+23
2014-01-27Merge branch 'jk/diff-filespec-cleanup'Junio C Hamano2-7/+5
2014-01-27Merge branch 'ef/mingw-write'Junio C Hamano5-25/+4
2014-01-27Merge branch 'rk/send-email-ssl-cert'Junio C Hamano1-1/+2
2014-01-27Merge branch 'jn/ignore-doc'Junio C Hamano1-1/+1
2014-01-27Merge branch 'jk/interpret-branch-name-fix'Junio C Hamano3-45/+124
2014-01-27Merge branch 'jk/allow-fetch-onelevel-refname'Junio C Hamano2-1/+12
2014-01-27Merge branch 'jc/revision-range-unpeel'Junio C Hamano2-12/+33
2014-01-27Merge branch 'mh/retire-ref-fetch-rules'Junio C Hamano3-10/+13
2014-01-27Merge branch 'mh/attr-macro-doc'Junio C Hamano1-3/+6
2014-01-27Merge branch 'jc/maint-pull-docfix'Junio C Hamano2-5/+8
2014-01-27Merge branch 'jk/complete-merge-base'Junio C Hamano1-1/+7
2014-01-27Merge branch 'ab/subtree-doc'Junio C Hamano2-13/+23
2014-01-27http-protocol.txt: don't use uppercase for variable names in "The Negotiation...Thomas Ackermann1-23/+22
2014-01-27Documentation: make it easier to maintain enumerated documentsJunio C Hamano1-3/+6
2014-01-27create HTML for http-protocol.txtThomas Ackermann2-105/+110
2014-01-27tree_entry_interesting: match against all pathspecsAndy Spencer2-1/+14
2014-01-27Makefile: remove redundant object in git-http{fetch,push}John Keeping1-2/+2
2014-01-27doc: remote author/documentation sections from more pagesMichael Haggerty6-40/+0
2014-01-25l10n: remove 2 blank translations on Danish, DutchJiang Xin3-7004/+0
2014-01-25l10n: zh_CN.po: translate 27 messages (2210t0f0u)Jiang Xin1-837/+972
2014-01-23t7700: do not use "touch" unnecessarilyJeff King1-1/+1
2014-01-23t7501: fix "empty commit" test with NO_PERLJeff King1-0/+1
2014-01-23tree-walk.c: ignore trailing slash on submodule in tree_entry_interesting()Nguyễn Thái Ngọc Duy2-1/+18
2014-01-23repack: propagate pack-objects options as stringsJeff King1-11/+11
2014-01-23repack: make parsed string options const-correctJeff King1-1/+1