summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2014-09-29Git 2.1.2v2.1.2Junio C Hamano4-3/+24
2014-09-29Merge branch 'jk/fsck-exit-code-fix' into maintJunio C Hamano3-9/+87
2014-09-29Merge branch 'ta/config-add-to-empty-or-true-fix' into maintJunio C Hamano4-7/+41
2014-09-29Merge branch 'mk/reachable-protect-detached-head' into maintJunio C Hamano2-0/+25
2014-09-29Merge branch 'mb/fast-import-delete-root' into maintJunio C Hamano2-1/+109
2014-09-29Merge branch 'jk/index-pack-threading-races' into maintJunio C Hamano1-2/+31
2014-09-29Merge branch 'jk/send-pack-many-refspecs' into maintJunio C Hamano5-2/+153
2014-09-29Merge branch 'so/rebase-doc' into maintJunio C Hamano1-6/+3
2014-09-28Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2-50/+51
2014-09-25l10n: de.po: use comma before "um"Phillip Sz1-43/+43
2014-09-25l10n: de.po: change Email to E-MailPhillip Sz1-7/+7
2014-09-25po/TEAMS: add new member to German translation teamRalf Thielow1-0/+1
2014-09-19Git 2.1.1v2.1.1Junio C Hamano4-3/+48
2014-09-19Merge branch 'et/spell-poll-infinite-with-minus-one-only' into maintJunio C Hamano1-1/+3
2014-09-19Merge branch 'nd/fetch-pass-quiet-to-gc-child-process' into maintJunio C Hamano1-4/+6
2014-09-19Merge branch 'jk/prune-top-level-refs-after-packing' into maintJunio C Hamano2-1/+9
2014-09-19Merge branch 'jk/fast-import-fixes' into maintJunio C Hamano1-8/+13
2014-09-19Merge branch 'jn/unpack-trees-checkout-m-carry-deletion' into maintJunio C Hamano2-21/+27
2014-09-19Merge branch 'sp/pack-protocol-doc-on-shallow' into maintJunio C Hamano1-1/+1
2014-09-19Merge branch 'jk/prompt-stash-could-be-packed' into maintJunio C Hamano1-1/+2
2014-09-19Merge branch 'rs/refresh-beyond-symlink' into maintJunio C Hamano2-0/+51
2014-09-19Merge branch 'lf/bundle-exclusion' into maintJunio C Hamano2-3/+6
2014-09-19Merge branch 'jc/apply-ws-prefix' into maintJunio C Hamano3-63/+96
2014-09-19Merge branch 'jk/command-line-config-empty-string' into maintJunio C Hamano3-2/+26
2014-09-19Merge branch 'jk/pretty-empty-format' into maintJunio C Hamano5-6/+14
2014-09-16Documentation/git-rebase.txt: <upstream> must be given to specify <branch>Sergey Organov1-1/+1
2014-09-12fsck: return non-zero status on missing ref tipsJeff King2-1/+58
2014-09-11config: avoid a funny sentinel value "a^"Jeff King3-7/+21
2014-09-10fsck: exit with non-zero status upon error from fsck_obj()Jeff King3-8/+29
2014-09-03reachable.c: add HEAD to reachability starting commitsMax Kirillov2-0/+25
2014-08-29index-pack: fix race condition with duplicate basesJeff King1-2/+31
2014-08-29fast-import: fix segfault in store_tree()Maxim Bublis2-3/+7
2014-08-29t9300: test filedelete commandMaxim Bublis1-0/+104
2014-08-29Merge git://github.com/git-l10n/git-poJunio C Hamano2-1359/+1515
2014-08-29po/TEAMS: add new members to German translation teamRalf Thielow1-0/+2
2014-08-29l10n: de.po: translate 38 new messagesRalf Thielow1-1359/+1513
2014-08-28Document LF appearing in shallow command during send-pack/receive-packShawn Pearce1-1/+1
2014-08-26send-pack: take refspecs over stdinJeff King5-2/+153
2014-08-26Merge branch 'jk/diff-tree-t-fix'Junio C Hamano2-1/+45
2014-08-26Merge branch 'jk/pack-shallow-always-without-bitmap'Junio C Hamano2-0/+40
2014-08-26Merge branch 'jk/fix-profile-feedback-build'Junio C Hamano1-1/+5
2014-08-25checkout -m: attempt merge when deletion of path was stagedJonathan Nieder2-5/+23
2014-08-25Merge git://github.com/git-l10n/git-poJunio C Hamano9-9039/+21279
2014-08-25git-prompt: do not look for refs/stash in $GIT_DIRJeff King1-1/+2
2014-08-25fast-import: fix buffer overflow in dump_tagsJeff King1-4/+6
2014-08-25fast-import: clean up pack_data pointer in end_packfileJeff King1-4/+7
2014-08-25pack-refs: prune top-level refs like "refs/foo"Jeff King2-1/+9
2014-08-23l10n: de.po: improve message when switching branchesRalf Thielow1-3/+3
2014-08-23l10n: de.po: fix typoRalf Thielow1-2/+2
2014-08-22po/TEAMS: Add Catalan teamAlex Henrie1-0/+4
2014-08-22l10n: Add Catalan translationAlex Henrie1-0/+10951
2014-08-22upload-pack: keep poll(2)'s timeout to -1Edward Thomson1-1/+3
2014-08-20intersect_paths: respect mode in git's tree-sortJeff King2-1/+45
2014-08-19Makefile: make perf tests optional for profile buildJeff King1-1/+5
2014-08-18make config --add behave correctly for empty and NULL valuesTanay Abhra3-2/+22
2014-08-18fetch: silence git-gc if --quiet is givenNguyễn Thái Ngọc Duy1-0/+2
2014-08-18fetch: convert argv_gc_auto to struct argv_arrayNguyễn Thái Ngọc Duy1-4/+4
2014-08-15Git 2.1v2.1.0Junio C Hamano2-1/+6
2014-08-13tests: fix negated test_i18ngrep callsJohannes Sixt3-6/+6
2014-08-13unpack-trees: use 'cuddled' style for if-else cascadeJonathan Nieder1-8/+4
2014-08-13unpack-trees: simplify 'all other failures' caseStefan Beller1-10/+2
2014-08-12Documentation/git-rebase.txt: -f forces a rebase that would otherwise be a no-opSergey Organov1-5/+2
2014-08-12pack-objects: turn off bitmaps when we see --shallow linesJeff King2-0/+40
2014-08-10read-cache: check for leading symlinks when refreshing indexRené Scharfe2-0/+51
2014-08-10Merge branch 'master' of git://ozlabs.org/~paulus/gitkJunio C Hamano2-323/+341
2014-08-08Git 2.1-rc2v2.1.0-rc2Junio C Hamano1-1/+1
2014-08-08gitk: Updated Bulgarian translation (302t,0f,0u)Alexander Shopov1-323/+329
2014-08-08gitk: Add keybinding to switch to parent commitMax Kirillov1-0/+12
2014-08-07bundle: fix exclusion of annotated tagsLukas Fleischer2-3/+6
2014-08-07apply: omit ws check for excluded pathsJunio C Hamano2-3/+17
2014-08-07apply: hoist use_patch() helper for path exclusion upJunio C Hamano1-38/+43
2014-08-07apply: use the right attribute for paths in non-Git patchesJunio C Hamano2-22/+36
2014-08-07Merge branch 'mb/relnotes-2.1'Junio C Hamano1-61/+53
2014-08-07Release notes: grammatical fixesMarc Branchaud1-55/+53
2014-08-07various contrib: Fix links in man pagesStefan Beller3-3/+3
2014-08-07l10n: fr.po (2257t) update for version 2.1.0Jean-Noel Avila1-1353/+1518
2014-08-05RelNotes: no more check_ref_format micro-optimizationJunio C Hamano1-6/+0
2014-08-05config: teach "git -c" to recognize an empty stringJunio C Hamano3-2/+26
2014-08-05Merge remote-tracking branch 'l10n/vi/vnwildman/master'Jiang Xin1-1350/+1503
2014-08-05Merge branch 'master' of github.com:alshopov/git-poJiang Xin1-549/+601
2014-08-05l10n: sv.po: Update Swedish translation (2257t0f0u)Peter Krefting1-1342/+1493
2014-08-05l10n: vi.po (2257t): Update translationTran Ngoc Quan1-1350/+1503
2014-08-04Git 2.1.0-rc1v2.1.0-rc1Junio C Hamano1-1/+1
2014-08-04Merge branch 'tf/maint-doc-push'Junio C Hamano1-1/+1
2014-08-04Merge branch 'ta/doc-config'Junio C Hamano1-1/+30
2014-08-04l10n: Updated Bulgarian translation of git (2257t,0f,0u)Alexander Shopov1-549/+601
2014-08-04l10n: zh_CN: translations for git v2.1.0-rc0Jiang Xin1-1342/+1480
2014-08-04Merge commit 'bg/alshopov/master'Jiang Xin1-2208/+2694
2014-08-04Merge remote-tracking branch 'sv/nafmo/master'Jiang Xin1-19/+19
2014-08-04l10n: git.pot: v2.1.0 round 1 (38 new, 9 removed)Jiang Xin1-1332/+1472
2014-08-03l10n: Updated Bulgarian translation of git (2247t,0f,0u)Alexander Shopov1-1252/+1348
2014-08-03l10n: Updated Bulgarian translation of git (2228t,0f,0u)Alexander Shopov1-962/+1352
2014-07-31git-push: fix link in man pageTony Finch1-1/+1
2014-07-30Sync with 2.0.4Junio C Hamano3-1/+8
2014-07-30Update draft release notes to 2.1Junio C Hamano1-3/+5
2014-07-30Merge branch 'jk/more-push-completion'Junio C Hamano1-1/+27
2014-07-30Merge branch 'sk/mingw-tests-workaround'Junio C Hamano8-24/+51
2014-07-30Merge branch 'sk/mingw-uni-fix-more'Junio C Hamano8-150/+184
2014-07-30Merge branch 'ep/avoid-test-a-o'Junio C Hamano1-2/+8
2014-07-30Git 2.0.4v2.0.4Junio C Hamano4-3/+9
2014-07-30pretty: make empty userformats truly emptyJeff King4-3/+11
2014-07-30pretty: treat "--format=" as an empty userformatJeff King1-2/+2
2014-07-30revision: drop useless string offset when parsing "--pretty"Jeff King1-1/+1
2014-07-30add documentation for writing config filesTanay Abhra1-1/+30
2014-07-30commit --amend: test specifies authorship but forgets to checkFabian Ruch1-0/+1
2014-07-28Merge branch 'maint'Junio C Hamano1-0/+10
2014-07-28t4013: test diff-tree's --stdin commit formattingJeff King1-0/+10
2014-07-28Merge branch 'jk/misc-fixes-maint'Junio C Hamano7-13/+16
2014-07-28t1402: check for refs ending with a dotJeff King1-0/+1
2014-07-28Revert "Merge branch 'dt/refs-check-refname-component-sse'"Junio C Hamano4-250/+18
2014-07-28Revert "Merge branch 'dt/refs-check-refname-component-sse-fix'"Junio C Hamano2-13/+5
2014-07-28Merge branch 'jk/alloc-commit-id-maint' into maintJunio C Hamano11-89/+103
2014-07-28diff-tree: avoid lookup_unknown_objectJeff King1-3/+1
2014-07-28object_as_type: set commit indexJeff King1-0/+2
2014-07-28alloc: factor out commit indexJeff King2-2/+8
2014-07-28add object_as_type helper for casting objectsJeff King7-43/+25
2014-07-28parse_object_buffer: do not set object typeJeff King1-2/+0
2014-07-28move setting of object->type to alloc_* functionsJeff King8-12/+13
2014-07-28alloc: write out allocator definitionsJeff King1-11/+27
2014-07-28alloc.c: remove the alloc_raw_commit_node() functionRamsay Jones1-18/+29
2014-07-27Git 2.1.0-rc0v2.1.0-rc0Junio C Hamano2-1/+23
2014-07-27Merge branch 'jk/rebase-am-fork-point'Junio C Hamano4-8/+41
2014-07-27Merge branch 'cc/replace-graft'Junio C Hamano6-26/+313
2014-07-27Merge branch 'jk/stable-prio-queue'Junio C Hamano4-51/+60
2014-07-25t9814: fix misconversion from test $a -o $b to test $a || test $bJunio C Hamano1-2/+8
2014-07-24apply: avoid possible bogus pointerJeff King1-1/+1
2014-07-24fix memory leak parsing core.commentcharJeff King1-5/+5
2014-07-24transport: fix leaks in refs_from_alternate_cbJeff King1-2/+3
2014-07-24free ref string returned by dwim_refJeff King3-1/+5
2014-07-24receive-pack: don't copy "dir" parameterJeff King1-2/+2
2014-07-23Sync with v2.0.3Junio C Hamano3-2/+21
2014-07-23Merge branch 'rs/fix-unlink-unix-socket'Junio C Hamano1-1/+2
2014-07-23Merge branch 'ta/string-list-init'Junio C Hamano7-15/+19
2014-07-23Merge branch 'mb/local-clone-after-applying-insteadof'Junio C Hamano1-12/+13
2014-07-23Merge branch 'jk/tag-sort'Junio C Hamano4-39/+115
2014-07-23Git 2.0.3v2.0.3Junio C Hamano4-3/+21
2014-07-23.mailmap: combine Stefan Beller's emailsStefan Beller1-0/+1
2014-07-23git.1: switch homepage for statsStefan Beller1-1/+1
2014-07-22completion: complete `git push --force-with-lease=`John Keeping1-1/+21
2014-07-22completion: add some missing options to `git push`John Keeping1-0/+1
2014-07-22completion: complete "unstuck" `git push --recurse-submodules`John Keeping1-0/+5
2014-07-22Sync with maintJunio C Hamano1-1/+1
2014-07-22Merge branch 'rs/code-cleaning'Junio C Hamano13-103/+41
2014-07-22Merge branch 'nd/path-max-must-go'Junio C Hamano2-46/+57
2014-07-22Merge branch 'jk/alloc-commit-id'Junio C Hamano11-89/+103
2014-07-22Merge branch 'kb/perf-trace'Junio C Hamano17-176/+629
2014-07-22Merge branch 'ah/fix-http-push' into maintJunio C Hamano1-1/+1
2014-07-22Merge branch 'po/error-message-style' into maintJunio C Hamano1-0/+9
2014-07-22Merge branch 'zk/log-graph-showsig' into maintJunio C Hamano2-0/+32
2014-07-22Merge branch 'mg/fix-log-mergetag-color' into maintJunio C Hamano1-10/+11
2014-07-22Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into maintJunio C Hamano2-1/+18
2014-07-22Merge branch 'ye/doc-http-proto' into maintJunio C Hamano1-1/+1
2014-07-22Merge branch 'jm/api-strbuf-doc' into maintJunio C Hamano1-5/+5
2014-07-22Merge branch 'jm/dedup-test-config' into maintJunio C Hamano1-5/+0
2014-07-22Merge branch 'sk/test-cmp-bin' into maintJunio C Hamano5-22/+28
2014-07-22Merge branch 'jm/doc-wording-tweaks' into maintJunio C Hamano2-9/+8
2014-07-22Merge branch 'jm/instaweb-apache-24' into maintJunio C Hamano1-1/+11
2014-07-22Merge branch 'bg/xcalloc-nmemb-then-size' into maintJunio C Hamano12-21/+21
2014-07-22Merge branch 'cb/byte-order' into maintJunio C Hamano1-9/+24
2014-07-22Merge branch 'lt/request-pull' into maintJunio C Hamano1-1/+1
2014-07-22Merge branch 'ep/shell-assign-and-export-vars' into maintJunio C Hamano5-5/+16
2014-07-22Merge branch 'maint-1.9' into maintJunio C Hamano1-1/+1
2014-07-22Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano1-1/+1
2014-07-22Documentation: fix missing text for rev-parse --verifybrian m. carlson1-1/+1
2014-07-21Merge branch 'maint'Junio C Hamano10-27/+10
2014-07-21Ninth batch for 2.1Junio C Hamano1-0/+4
2014-07-21replace: add test for --graft with a mergetagChristian Couder1-0/+22
2014-07-21replace: check mergetags when using --graftChristian Couder1-0/+47
2014-07-21replace: add test for --graft with signed commitChristian Couder1-0/+24
2014-07-21replace: remove signature when using --graftChristian Couder3-0/+41
2014-07-21contrib: add convert-grafts-to-replace-refs.shChristian Couder2-1/+31
2014-07-21Documentation: replace: add --graft optionChristian Couder1-0/+8
2014-07-21replace: add test for --graftChristian Couder1-1/+44
2014-07-21replace: add --graft optionChristian Couder1-1/+73
2014-07-21Merge branch 'rs/unify-is-branch'Junio C Hamano3-6/+3
2014-07-21Merge branch 'kb/avoid-fchmod-for-now'Junio C Hamano1-4/+4
2014-07-21Merge branch 'sk/mingw-uni-fix'Junio C Hamano4-77/+171
2014-07-21Merge branch 'ek/alt-odb-entry-fix'Junio C Hamano2-4/+33
2014-07-21Merge branch 'kb/hashmap-updates'Junio C Hamano12-61/+159
2014-07-21Merge branch 'jk/remote-curl-squelch-extra-errors'Junio C Hamano1-8/+6
2014-07-21Merge branch 'rs/ref-transaction-0'Junio C Hamano6-100/+199
2014-07-21Merge branch 'jl/submodule-tests'Junio C Hamano14-0/+974
2014-07-21Merge branch 'ak/profile-feedback-build'Junio C Hamano3-8/+34
2014-07-21Merge branch 'cc/for-each-mergetag'Junio C Hamano3-11/+22
2014-07-21Fix contrib/subtree Makefile to patch #! lineCharles Bailey1-1/+7
2014-07-21use xmemdupz() to allocate copies of strings given by start and lengthRené Scharfe6-19/+6
2014-07-21use xcalloc() to allocate zero-initialized memoryRené Scharfe4-8/+4
2014-07-21replace memset with string-list initializersTanay Abhra4-15/+6
2014-07-21string-list: add string_list initializer helper functionTanay Abhra3-0/+13
2014-07-21t800[12]: work around MSys limitationKarsten Blees1-0/+12
2014-07-21t9902: mingw-specific fix for gitfile link filesPat Thoyts1-4/+13
2014-07-21t4210: skip command-line encoding tests on mingwPat Thoyts1-2/+2
2014-07-21MinGW: disable legacy encoding testsKarsten Blees3-15/+18
2014-07-21t0110/MinGW: skip tests that pass arbitrary bytes on the command lineKarsten Blees1-2/+5
2014-07-21unix-socket: remove stale socket before calling chdir()René Scharfe1-1/+2
2014-07-21Win32: enable color output in Windows cmd.exeKarsten Blees1-0/+4
2014-07-21Win32: patch Windows environment on startupKarsten Blees1-13/+12
2014-07-21Win32: keep the environment sortedKarsten Blees1-39/+65
2014-07-21Win32: use low-level memory allocation during initializationKarsten Blees1-15/+28
2014-07-21Win32: reduce environment array reallocationsKarsten Blees1-27/+35