summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2014-01-17Git 1.9-rc0v1.9-rc0Junio C Hamano2-1/+13
2014-01-17Merge branch 'maint'Junio C Hamano0-0/+0
2014-01-17Merge branch 'fp/submodule-checkout-mode'Junio C Hamano1-1/+12
2014-01-17Merge branch 'nd/shallow-clone'Junio C Hamano36-168/+1535
2014-01-17Merge branch 'jk/pull-rebase-using-fork-point'Junio C Hamano1-1/+1
2014-01-17pull: suppress error when no remoteref is foundJohn Keeping1-1/+1
2014-01-17git-svn: workaround for a bug in svn serf backendRoman Kagan1-2/+8
2014-01-13Sync with 1.8.5.3Junio C Hamano3-3/+31
2014-01-13Update draft release notes to 1.9Junio C Hamano1-0/+15
2014-01-13Merge branch 'jk/t5531-prepare-to-default-to-non-matching'Junio C Hamano1-0/+1
2014-01-13Merge branch 'sb/diff-orderfile-config'Junio C Hamano1-4/+0
2014-01-13Merge branch 'mh/shorten-unambigous-ref'Junio C Hamano1-31/+14
2014-01-13Merge branch 'mm/mv-file-to-no-such-dir-with-slash'Junio C Hamano1-0/+2
2014-01-13Merge branch 'jl/submodule-mv-checkout-caveat'Junio C Hamano4-0/+58
2014-01-13Merge branch 'jk/pull-rebase-using-fork-point'Junio C Hamano2-3/+12
2014-01-13Merge branch 'rr/completion-format-coverletter'Junio C Hamano1-0/+1
2014-01-13Merge branch 'ow/stash-with-ifs'Junio C Hamano2-7/+19
2014-01-13Merge branch 'jn/pager-lv-default-env'Junio C Hamano5-3/+28
2014-01-13Merge branch 'br/sha1-name-40-hex-no-disambiguation'Junio C Hamano1-2/+2
2014-01-13Git 1.8.5.3v1.8.5.3Junio C Hamano4-3/+31
2014-01-13Merge branch 'nd/daemon-informative-errors-typofix' into maintJunio C Hamano1-2/+2
2014-01-13Merge branch 'km/gc-eperm' into maintJunio C Hamano1-1/+1
2014-01-13Merge branch 'jk/credential-plug-leak' into maintJunio C Hamano1-1/+2
2014-01-13Merge branch 'mm/mv-file-to-no-such-dir-with-slash' into maintJunio C Hamano2-7/+47
2014-01-13Merge branch 'jk/rev-parse-double-dashes' into maintJunio C Hamano2-1/+39
2014-01-13Merge branch 'jk/cat-file-regression-fix' into maintJunio C Hamano2-10/+42
2014-01-13pack-heuristics.txt: mark up the file header properlyThomas Ackermann1-2/+2
2014-01-13t5531: further "matching" fixupsJeff King1-0/+1
2014-01-10diff test: reading a directory as a file need not error outJonathan Nieder1-4/+0
2014-01-10mv: let 'git mv file no-such-dir/' error out on Windows, tooJohannes Sixt1-0/+2
2014-01-10Update draft release notes to 1.9Junio C Hamano1-1/+114
2014-01-10Merge branch 'ss/builtin-cleanup'Junio C Hamano4-125/+143
2014-01-10Merge branch 'vm/octopus-merge-bases-simplify'Junio C Hamano1-18/+18
2014-01-10Merge branch 'ta/format-user-manual-as-an-article'Junio C Hamano2-2/+2
2014-01-10Merge branch 'rr/completion-branch-config'Junio C Hamano2-5/+29
2014-01-10Merge branch 'js/lift-parent-count-limit'Junio C Hamano4-10/+45
2014-01-10Merge branch 'jk/test-framework-updates'Junio C Hamano2-14/+7
2014-01-10Merge branch 'bm/merge-base-octopus-dedup'Junio C Hamano2-6/+65
2014-01-10Merge branch 'km/gc-eperm'Junio C Hamano1-1/+1
2014-01-10Merge branch 'jk/http-auth-tests-robustify'Junio C Hamano6-17/+26
2014-01-10Merge branch 'jk/credential-plug-leak'Junio C Hamano1-1/+2
2014-01-10Merge branch 'bs/mirbsd'Junio C Hamano2-1/+8
2014-01-10Merge branch 'nd/commit-tree-constness'Junio C Hamano2-4/+4
2014-01-10Merge branch 'jk/oi-delta-base'Junio C Hamano5-3/+103
2014-01-10Merge branch 'jk/sha1write-void'Junio C Hamano4-7/+3
2014-01-10Merge branch 'nd/add-empty-fix'Junio C Hamano2-1/+20
2014-01-10Merge branch 'nd/daemon-informative-errors-typofix'Junio C Hamano1-2/+2
2014-01-10Merge branch 'tm/fetch-prune'Junio C Hamano2-10/+58
2014-01-10Merge branch 'sb/diff-orderfile-config'Junio C Hamano5-15/+125
2014-01-10Merge branch 'bc/log-decoration'Junio C Hamano2-0/+17
2014-01-10Merge branch 'jh/rlimit-nofile-fallback'Junio C Hamano1-7/+30
2014-01-10Merge branch 'rt/bfg-ad-in-filter-branch-doc'Junio C Hamano1-1/+32
2014-01-10Merge branch 'mh/path-max'Junio C Hamano2-31/+45
2014-01-10Merge branch 'ap/path-max'Junio C Hamano3-36/+42
2014-01-10Merge branch 'cc/replace-object-info'Junio C Hamano8-26/+141
2014-01-10Merge branch 'nd/negative-pathspec'Junio C Hamano7-40/+354
2014-01-09rebase: fix fork-point with zero argumentsJohn Keeping2-3/+12
2014-01-09shorten_unambiguous_ref(): tighten up pointer arithmeticMichael Haggerty1-2/+2
2014-01-09gen_scanf_fmt(): delete function and use snprintf() insteadMichael Haggerty1-26/+9
2014-01-09shorten_unambiguous_ref(): introduce a new local variableMichael Haggerty1-4/+4
2014-01-09t5537: fix incorrect expectation in test case 10Nguyễn Thái Ngọc Duy1-1/+2
2014-01-07rm: better document side effects when removing a submoduleJens Lehmann2-0/+25
2014-01-07mv: better document side effects when moving a submoduleJens Lehmann2-0/+33
2014-01-07stash: handle specifying stashes with $IFSØystein Walle2-7/+19
2014-01-07completion: complete format.coverLetterRamkumar Ramachandra1-0/+1
2014-01-07sha1_name: don't resolve refs when core.warnambiguousrefs is falseBrodie Rao1-2/+2
2014-01-07pager: set LV=-c alongside LESS=FRSXJonathan Nieder5-3/+28
2014-01-07git-submodule.sh: 'checkout' is a valid update modeFrancesco Pretto1-1/+12
2014-01-06user-manual: improve html and pdf formattingThomas Ackermann2-2/+2
2014-01-06builtin/help.c: speed up is_git_command() by checking for builtin commands firstSebastian Schuberth4-117/+134
2014-01-06builtin/help.c: call load_command_list() only when it is neededSebastian Schuberth1-1/+2
2014-01-06git.c: consistently use the term "builtin" instead of "internal command"Sebastian Schuberth2-8/+8
2014-01-06Merge branch 'maint'Junio C Hamano2-8/+10
2014-01-06completion: fix remote.pushdefaultRamkumar Ramachandra1-0/+1
2014-01-06completion: fix branch.autosetup(merge|rebase)Ramkumar Ramachandra1-0/+1
2014-01-06completion: introduce __gitcomp_nl_append ()Ramkumar Ramachandra2-4/+26
2014-01-06zsh completion: find matching custom bash completionRamkumar Ramachandra1-1/+1
2014-01-06Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano1-8/+8
2014-01-06Documentation/gitmodules: Only 'update' and 'url' are requiredW. Trevor King1-0/+2
2014-01-06shallow: remove unused codeRamsay Jones4-20/+0
2014-01-06send-pack.c: mark a file-local function staticRamsay Jones1-1/+1
2014-01-03get_octopus_merge_bases(): cleanup redundant variableVasily Makarov1-18/+18
2014-01-03fetch --prune: Run prune before fetchingTom Miller2-5/+19
2014-01-03fetch --prune: always print header urlTom Miller2-5/+39
2014-01-03l10n: de.po: fix translation of 'prefix'Ralf Thielow1-8/+8
2014-01-02gc: notice gc processes run by other usersKyle J. McKay1-1/+1
2014-01-02t0000: drop "known breakage" testJeff King1-3/+0
2014-01-02t0000: simplify HARNESS_ACTIVE hackJeff King2-11/+5
2014-01-02t0000: set TEST_OUTPUT_DIRECTORY for sub-testsJeff King1-0/+2
2014-01-02use distinct username/password for http auth testsJeff King6-17/+26
2014-01-02Revert "prompt: clean up strbuf usage"Jeff King1-1/+2
2014-01-02Add MirBSD support to the build system.Benny Siegert2-1/+8
2013-12-30replace info: rename 'full' to 'long' and clarify in-code symbolsChristian Couder3-14/+18
2013-12-30Merge branch 'maint'Junio C Hamano1-2/+1
2013-12-30for-each-ref: remove unused variableRamkumar Ramachandra1-2/+1
2013-12-30merge-base --octopus: reduce the result from get_octopus_merge_bases()Junio C Hamano2-1/+40
2013-12-30merge-base: separate "--independent" codepath into its own helperJunio C Hamano1-6/+25
2013-12-27Remove the line length limit for graft filesJohannes Schindelin4-10/+45
2013-12-27Merge git://git.bogomips.org/git-svnJunio C Hamano1-2/+8
2013-12-27Merge branch 'fc/remote-helper-fixes'Junio C Hamano3-9/+103
2013-12-27Merge branch 'js/gnome-keyring'Junio C Hamano1-46/+39
2013-12-27Merge branch 'jk/name-pack-after-byte-representation'Junio C Hamano6-16/+9
2013-12-27Merge branch 'tg/diff-no-index-refactor'Junio C Hamano5-49/+103
2013-12-27Merge branch 'zk/difftool-counts'Junio C Hamano5-4/+43
2013-12-27Merge branch 'jk/cat-file-regression-fix'Junio C Hamano2-10/+42
2013-12-27Merge branch 'jk/pull-rebase-using-fork-point'Junio C Hamano4-11/+34
2013-12-27Merge branch 'jk/rev-parse-double-dashes'Junio C Hamano2-1/+39
2013-12-27Merge branch 'jc/push-refmap'Junio C Hamano5-28/+150
2013-12-27git-svn: workaround for a bug in svn serf backendRoman Kagan1-2/+8
2013-12-26commit.c: make "tree" a const pointer in commit_tree*()Nguyễn Thái Ngọc Duy2-4/+4
2013-12-26cat-file: provide %(deltabase) batch formatJeff King3-3/+49
2013-12-26sha1_object_info_extended: provide delta base sha1sJeff King2-0/+54
2013-12-26do not pretend sha1write returns errorsJeff King4-7/+3
2013-12-26add: don't complain when adding empty project rootNguyễn Thái Ngọc Duy2-1/+20
2013-12-26remote-hg: test 'shared_path' in a moved cloneAntoine Pelisse1-0/+11
2013-12-20log: properly handle decorations with chained tagsbrian m. carlson2-0/+17
2013-12-20daemon: be strict at parsing parameters --[no-]informative-errorsNguyễn Thái Ngọc Duy1-2/+2
2013-12-18diff: add diff.orderfile configuration variableSamuel Bronson4-0/+23
2013-12-18diff: let "git diff -O" read orderfile from any file and fail properlySamuel Bronson2-15/+34
2013-12-18t4056: add new tests for "git diff -O"Samuel Bronson1-0/+68
2013-12-18builtin/prune.c: use strbuf to avoid having to worry about PATH_MAXJeff King1-14/+24
2013-12-18get_max_fd_limit(): fall back to OPEN_MAX upon getrlimit/sysconf failureJunio C Hamano1-7/+30
2013-12-18docs: add filter-branch notes on The BFGRoberto Tyley1-1/+32
2013-12-17Sync with 1.8.5.2Junio C Hamano3-5/+24
2013-12-17Update draft release notes to 1.9Junio C Hamano1-0/+37
2013-12-17Merge branch 'kn/gitweb-extra-branch-refs'Junio C Hamano2-46/+175
2013-12-17Merge branch 'tb/clone-ssh-with-colon-for-port'Junio C Hamano7-147/+350
2013-12-17Merge branch 'nd/transport-positive-depth-only'Junio C Hamano2-0/+8
2013-12-17Merge branch 'cc/starts-n-ends-with'Junio C Hamano91-481/+484
2013-12-17Merge branch 'jl/commit-v-strip-marker'Junio C Hamano4-9/+58
2013-12-17Merge branch 'tr/send-email-ssl'Junio C Hamano1-2/+6
2013-12-17Merge branch 'nd/gettext-vsnprintf'Junio C Hamano1-4/+15
2013-12-17Merge branch 'mm/mv-file-to-no-such-dir-with-slash'Junio C Hamano2-7/+45
2013-12-17Merge branch 'nd/remove-opt-boolean'Junio C Hamano1-7/+4
2013-12-17Merge branch 'bc/doc-merge-no-op-revert'Junio C Hamano1-0/+8
2013-12-17Merge branch 'fc/trivial'Junio C Hamano5-6/+12
2013-12-17Merge branch 'jk/t5000-gzip-simplify'Junio C Hamano1-16/+4
2013-12-17Merge branch 'kb/doc-exclude-directory-semantics'Junio C Hamano1-2/+17
2013-12-17Git 1.8.5.2v1.8.5.2Junio C Hamano4-3/+24
2013-12-17Merge branch 'rs/doc-submitting-patches' into maintJunio C Hamano1-2/+9
2013-12-17Merge branch 'tr/doc-git-cherry' into maintJunio C Hamano1-33/+110
2013-12-17Merge branch 'nd/glossary-content-pathspec-markup' into maintJunio C Hamano1-3/+3
2013-12-17Merge branch 'jj/doc-markup-gitcli' into maintJunio C Hamano1-5/+5
2013-12-17Merge branch 'jj/doc-markup-hints-in-coding-guidelines' into maintJunio C Hamano1-3/+31
2013-12-17Merge branch 'jj/log-doc' into maintJunio C Hamano1-26/+25
2013-12-17Merge branch 'jj/rev-list-options-doc' into maintJunio C Hamano1-156/+87
2013-12-17Merge branch 'tb/doc-fetch-pack-url' into maintJunio C Hamano1-8/+7
2013-12-17Merge branch 'mi/typofixes' into maintJunio C Hamano8-10/+10
2013-12-17Merge branch 'jh/loose-object-dirs-creation-race' into maintJunio C Hamano1-1/+3
2013-12-17Merge branch 'jk/two-way-merge-corner-case-fix' into maintJunio C Hamano3-97/+121
2013-12-17Merge branch 'sb/sha1-loose-object-info-check-existence' into maintJunio C Hamano2-6/+15
2013-12-17Merge branch 'nd/magic-pathspec' into maintJunio C Hamano2-10/+13
2013-12-17cmd_repack(): remove redundant local variable "nr_packs"Michael Haggerty1-4/+2
2013-12-17prune-packed: use strbuf to avoid having to worry about PATH_MAXJunio C Hamano1-17/+21
2013-12-16Prevent buffer overflows when path is too longAntoine Pelisse3-36/+42
2013-12-16diff: avoid some nestingThomas Gummerer1-18/+17
2013-12-16diff: add test for --no-index executed outside repoThomas Gummerer1-0/+11
2013-12-16diff.c: fix some recent whitespace style violationsJeff King1-2/+2
2013-12-16pack-objects doc: treat output filename as opaqueJeff King1-2/+1
2013-12-16contrib/git-credential-gnome-keyring.c: small stylistic cleanupsJohn Szakmeister1-46/+39
2013-12-12Update draft release notes to 1.9Junio C Hamano1-1/+17
2013-12-12Merge branch 'jn/scripts-updates'Junio C Hamano53-600/+87
2013-12-12Merge branch 'cn/thin-push-capability'Junio C Hamano2-8/+25
2013-12-12Merge branch 'jk/remove-deprecated'Junio C Hamano18-411/+48
2013-12-12Merge branch 'tr/commit-slab-cleanup'Junio C Hamano1-8/+31
2013-12-12Merge branch 'rs/doc-submitting-patches'Junio C Hamano1-2/+9
2013-12-12Merge branch 'tr/doc-git-cherry'Junio C Hamano1-33/+110
2013-12-12Merge branch 'cl/p4-use-diff-tree'Junio C Hamano1-1/+1
2013-12-12Merge branch 'tr/config-multivalue-lift-max'Junio C Hamano2-6/+77
2013-12-12Merge branch 'mh/fetch-tags-in-addition-to-normal-refs'Junio C Hamano14-320/+503
2013-12-12gitweb: Denote non-heads, non-remotes branchesKrzesimir Nowak1-5/+29
2013-12-12gitweb: Add a feature for adding more branch refsKrzesimir Nowak2-12/+105
2013-12-12gitweb: Return 1 on validation success instead of passed inputKrzesimir Nowak1-29/+32
2013-12-12gitweb: Move check-ref-format code into separate functionKrzesimir Nowak1-4/+13
2013-12-12diff: don't read index when --no-index is givenThomas Gummerer3-2/+42
2013-12-12diff: move no-index detection to builtin/diff.cThomas Gummerer3-47/+51
2013-12-12Documentation/git-replace: describe --format optionChristian Couder1-1/+18
2013-12-12builtin/replace: unset read_replace_refsChristian Couder2-1/+3
2013-12-12t6050: add tests for listing with --formatChristian Couder1-0/+37
2013-12-12builtin/replace: teach listing using short, medium or full formatsChristian Couder1-7/+54
2013-12-12sha1_file: perform object replacement in sha1_object_info_extended()Christian Couder2-7/+8
2013-12-12t6050: show that git cat-file --batch fails with replace objectsChristian Couder1-0/+5
2013-12-12sha1_object_info_extended(): add an "unsigned flags" parameterChristian Couder4-6/+6
2013-12-12sha1_file.c: add lookup_replace_object_extended() to pass flagsChristian Couder2-2/+7
2013-12-12replace_object: don't check read_replace_refs twiceChristian Couder1-3/+0
2013-12-12rename READ_SHA1_FILE_REPLACE flag to LOOKUP_REPLACE_OBJECTChristian Couder2-3/+3
2013-12-12cat-file: handle --batch format with missing type/sizeJeff King2-1/+32
2013-12-12cat-file: pass expand_data to print_object_or_dieJeff King1-10/+11
2013-12-10git-clone.txt: remove shallow clone limitationsNguyễn Thái Ngọc Duy1-6/+1
2013-12-10prune: clean .git/shallow after pruning objectsNguyễn Thái Ngọc Duy6-2/+71
2013-12-10clone: use git protocol for cloning shallow repo locallyNguyễn Thái Ngọc Duy2-2/+16
2013-12-10send-pack: support pushing from a shallow clone via httpNguyễn Thái Ngọc Duy3-5/+42
2013-12-10receive-pack: support pushing to a shallow clone via httpNguyễn Thái Ngọc Duy2-3/+35
2013-12-10smart-http: support shallow fetch/cloneNguyễn Thái Ngọc Duy6-9/+81
2013-12-10remote-curl: pass ref SHA-1 to fetch-pack as wellNguyễn Thái Ngọc Duy2-1/+9
2013-12-10send-pack: support pushing to a shallow cloneNguyễn Thái Ngọc Duy3-4/+43
2013-12-10receive-pack: allow pushes that update .git/shallowNguyễn Thái Ngọc Duy5-13/+201
2013-12-10connected.c: add new variant that runs with --shallow-fileNguyễn Thái Ngọc Duy2-8/+36
2013-12-10add GIT_SHALLOW_FILE to propagate --shallow-file to subprocessesNguyễn Thái Ngọc Duy5-3/+12
2013-12-10receive/send-pack: support pushing from a shallow cloneNguyễn Thái Ngọc Duy5-11/+146