summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2015-03-31Git 2.3.5v2.3.5Junio C Hamano3-2/+6
2015-03-31Merge branch 'ss/pull-rebase-preserve' into maintJunio C Hamano2-4/+5
2015-03-31Merge branch 'jc/report-path-error-to-dir' into maintJunio C Hamano4-44/+44
2015-03-31Merge branch 'ph/push-doc-cas' into maintJunio C Hamano1-8/+6
2015-03-30docs: clarify what git-rebase's "-p" / "--preserve-merges" doesSebastian Schuberth1-1/+3
2015-03-28Prepare for 2.3.5Junio C Hamano2-1/+42
2015-03-28Merge branch 'sg/completion-gitcomp-nl-for-refs' into maintJunio C Hamano1-2/+2
2015-03-28Merge branch 'jk/simplify-csum-file-sha1fd-check' into maintJunio C Hamano1-7/+3
2015-03-28Merge branch 'tg/test-index-v4' into maintJunio C Hamano1-3/+12
2015-03-28Merge branch 'nd/doc-git-index-version' into maintJunio C Hamano1-1/+2
2015-03-28Merge branch 'ct/prompt-untracked-fix' into maintJunio C Hamano2-1/+12
2015-03-28Merge branch 'ws/grep-quiet-no-pager' into maintJunio C Hamano1-1/+1
2015-03-28Merge branch 'jc/submitting-patches-mention-send-email' into maintJunio C Hamano1-0/+5
2015-03-28Merge branch 'jk/cleanup-failed-clone' into maintJunio C Hamano1-5/+6
2015-03-28Merge branch 'jk/fetch-pack' into maintJunio C Hamano3-13/+22
2015-03-28Merge branch 'tg/fix-check-order-with-split-index' into maintJunio C Hamano1-19/+23
2015-03-28Merge branch 'jk/prune-with-corrupt-refs' into maintJunio C Hamano7-68/+147
2015-03-282.3.2 release notes: typofixThomas Ackermann1-1/+1
2015-03-27Merge branch 'jk/tag-h-column-is-a-listing-option' into maintJunio C Hamano1-2/+2
2015-03-27Merge branch 'jk/smart-http-hide-refs' into maintJunio C Hamano2-6/+21
2015-03-27Merge branch 'js/completion-ctags-pattern-substitution-fix' into maintJunio C Hamano1-1/+1
2015-03-27Update mailmap to spell out "Alexander Kuleshov"Junio C Hamano1-0/+1
2015-03-26docs: clarify "preserve" option wording for git-pullSebastian Schuberth1-3/+2
2015-03-26git-push.txt: clean up force-with-lease wordingPhil Hord1-8/+6
2015-03-24report_path_error(): move to dir.cJunio C Hamano4-44/+44
2015-03-24git.txt: list index versions in plain EnglishNguyễn Thái Ngọc Duy1-1/+2
2015-03-23Git 2.3.4v2.3.4Junio C Hamano4-3/+36
2015-03-23Merge branch 'rs/use-isxdigit' into maintJunio C Hamano2-2/+2
2015-03-23Merge branch 'rs/deflate-init-cleanup' into maintJunio C Hamano10-13/+2
2015-03-23Merge branch 'ak/git-done-help-cleanup' into maintJunio C Hamano1-3/+2
2015-03-23Merge branch 'sg/completion-remote' into maintJunio C Hamano2-5/+21
2015-03-23Merge branch 'mg/doc-status-color-slot' into maintJunio C Hamano2-2/+4
2015-03-23Merge branch 'jc/decorate-leaky-separator-color' into maintJunio C Hamano3-57/+84
2015-03-23Merge branch 'kn/git-cd-to-empty' into maintJunio C Hamano2-4/+16
2015-03-23Merge branch 'km/imap-send-libcurl-options' into maintJunio C Hamano2-3/+17
2015-03-23Merge branch 'mg/verify-commit' into maintJunio C Hamano1-2/+2
2015-03-23Merge branch 'es/rebase-i-count-todo' into maintJunio C Hamano2-1/+11
2015-03-23Merge branch 'tb/connect-ipv6-parse-fix' into maintJunio C Hamano3-80/+144
2015-03-22completion: use __gitcomp_nl() for completing refsSZEDER Gábor1-2/+2
2015-03-20read-cache: fix reading of split indexThomas Gummerer1-19/+23
2015-03-20refs.c: drop curate_packed_refsJeff King2-67/+2
2015-03-20repack: turn on "ref paranoia" when doing a destructive repackJeff King2-3/+7
2015-03-20prune: turn on ref_paranoia flagJeff King2-2/+3
2015-03-20refs: introduce a "ref paranoia" flagJeff King4-0/+25
2015-03-20t5312: test object deletion code paths in a corrupted repositoryJeff King1-0/+114
2015-03-20t1700: make test pass with index-v4Thomas Gummerer1-3/+12
2015-03-19fetch-pack: remove dead assignment to ref->new_sha1Jeff King1-3/+0
2015-03-19fetch_refs_via_pack: free extra copy of refsJeff King1-3/+5
2015-03-19filter_ref: make a copy of extra "sought" entriesJeff King2-6/+12
2015-03-19filter_ref: avoid overwriting ref->old_sha1 with garbageJeff King1-1/+5
2015-03-19clone: drop period from end of die_errno messageJeff King1-1/+1
2015-03-19clone: initialize atexit cleanup handler earlierJeff King1-4/+5
2015-03-19sha1fd_check: die when we cannot open the fileJeff King1-7/+3
2015-03-19grep: fix "--quiet" overwriting current outputWilhelm Schuermann1-1/+1
2015-03-15SubmittingPatches: encourage users to use format-patch and send-emailJunio C Hamano1-0/+5
2015-03-15git prompt: use toplevel to find untracked filesCody A Taylor2-1/+12
2015-03-14contrib/completion: escape the forward slash in __git_match_ctagJohn Szakmeister1-1/+1
2015-03-13Git 2.3.3v2.3.3Junio C Hamano4-3/+43
2015-03-13Merge branch 'mr/doc-clean-f-f' into maintJunio C Hamano1-2/+6
2015-03-13Merge branch 'ak/t5516-typofix' into maintJunio C Hamano1-1/+1
2015-03-13Merge branch 'jc/diff-test-updates' into maintJunio C Hamano11-175/+550
2015-03-13Merge branch 'jk/diffcore-rename-duplicate' into maintJunio C Hamano2-13/+110
2015-03-13Merge branch 'bw/kwset-use-unsigned' into maintJunio C Hamano4-7/+7
2015-03-13Merge branch 'nd/grep-exclude-standard-help-fix' into maintJunio C Hamano1-1/+1
2015-03-13Merge branch 'mg/doc-remote-tags-or-not' into maintJunio C Hamano1-0/+3
2015-03-13Merge branch 'mk/diff-shortstat-dirstat-fix' into maintJunio C Hamano2-1/+15
2015-03-13Merge branch 'ms/submodule-update-config-doc' into maintJunio C Hamano3-37/+64
2015-03-13Merge branch 'jc/apply-beyond-symlink' into maintJunio C Hamano4-2/+399
2015-03-13Merge branch 'rs/daemon-interpolate' into maintJunio C Hamano1-15/+72
2015-03-13Merge branch 'jk/daemon-interpolate' into maintJunio C Hamano3-6/+83
2015-03-12upload-pack: do not check NULL return of lookup_unknown_objectJeff King1-2/+0
2015-03-12upload-pack: fix transfer.hiderefs over smart-httpJeff King2-4/+21
2015-03-12tag: fix some mis-organized options in "-h" listingJeff King1-2/+2
2015-03-10use isxdigit() for checking if a character is a hexadecimal digitRené Scharfe2-2/+2
2015-03-10config,completion: add color.status.unmergedMichael J Gruber2-2/+5
2015-03-10t7510: do not fail when gpg warns about insecure memoryKyle J. McKay1-2/+2
2015-03-10imap-send: use cURL automatically when NO_OPENSSL definedKyle J. McKay2-3/+17
2015-03-06git: treat "git -C '<path>'" as a no-op when <path> is emptyKarthik Nayak2-4/+16
2015-03-06Git 2.3.2v2.3.2Junio C Hamano3-2/+14
2015-03-06Merge branch 'rj/no-xopen-source-for-cygwin' into maintJunio C Hamano1-6/+0
2015-03-06Merge branch 'rs/simple-cleanups' into maintJunio C Hamano4-13/+7
2015-03-06Merge branch 'mm/am-c-doc' into maintJunio C Hamano2-1/+9
2015-03-06Merge branch 'ew/svn-maint-fixes' into maintJunio C Hamano3-1/+13
2015-03-06Merge branch 'km/send-email-getopt-long-workarounds' into maintJunio C Hamano2-5/+15
2015-03-06completion: simplify __git_remotes()SZEDER Gábor1-5/+2
2015-03-06completion: add a test for __git_remotes() helper functionSZEDER Gábor1-0/+19
2015-03-06rebase-interactive: re-word "item count" commentEric Sunshine1-1/+1
2015-03-06rebase-interactive: suppress whitespace preceding item countEric Sunshine2-0/+10
2015-03-06git: make was_alias and done_help non-staticAlexander Kuleshov1-3/+2
2015-03-05zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}René Scharfe10-13/+2
2015-03-05Prepare for 2.3.2Junio C Hamano2-1/+69
2015-03-05Merge branch 'sb/plug-leak-in-make-cache-entry' into maintJunio C Hamano1-2/+8
2015-03-05Merge branch 'jk/fast-import-die-nicely-fix' into maintJunio C Hamano1-1/+5
2015-03-05Merge branch 'es/blame-commit-info-fix' into maintJunio C Hamano1-3/+2
2015-03-05Merge branch 'ab/merge-file-prefix' into maintJunio C Hamano2-2/+4
2015-03-05Merge branch 'ps/submodule-sanitize-path-upon-add' into maintJunio C Hamano2-1/+18
2015-03-05Merge branch 'jk/prune-mtime' into maintJunio C Hamano3-13/+48
2015-03-05Merge branch 'tc/curl-vernum-output-broken-in-7.11' into maintJunio C Hamano1-2/+2
2015-03-05Merge branch 'es/squelch-openssl-warnings-on-macosx' into maintJunio C Hamano1-3/+6
2015-03-05Merge branch 'jc/conf-var-doc' into maintJunio C Hamano2-8/+30
2015-03-05Merge branch 'av/wincred-with-at-in-username-fix' into maintJunio C Hamano1-3/+22
2015-03-05Merge branch 'ch/new-gpg-drops-rfc-1991' into maintJunio C Hamano2-0/+58
2015-03-05Merge branch 'jc/remote-set-url-doc' into maintJunio C Hamano1-6/+14
2015-03-05Merge branch 'jk/pack-bitmap' into maintJunio C Hamano1-1/+2
2015-03-05Merge branch 'jk/config-no-ungetc-eof' into maintJunio C Hamano2-3/+17
2015-03-05Merge branch 'jk/decimal-width-for-uintmax' into maintJunio C Hamano2-5/+5
2015-03-05Merge branch 'jc/push-cert' into maintJunio C Hamano1-1/+1
2015-03-05Merge branch 'mh/deref-symref-over-helper-transport' into maintJunio C Hamano3-6/+39
2015-03-05Merge branch 'ks/rebase-i-abbrev' into maintJunio C Hamano2-9/+15
2015-03-05Merge branch 'dp/remove-duplicated-header-inclusion' into maintJunio C Hamano4-4/+0
2015-03-05Merge branch 'sb/hex-object-name-is-at-most-41-bytes-long' into maintJunio C Hamano1-1/+1
2015-03-05Merge branch 'ak/git-pm-typofix' into maintJunio C Hamano1-2/+2
2015-03-05Merge branch 'jk/sanity' into maintJunio C Hamano4-9/+42
2015-03-04log --decorate: do not leak "commit" color into the next itemJunio C Hamano3-8/+16
2015-03-04Documentation/config.txt: simplify boolean description in the syntax sectionJunio C Hamano1-2/+2
2015-03-04Documentation/config.txt: describe 'color' value type in the "Values" sectionJunio C Hamano1-16/+13
2015-03-04Documentation/config.txt: have a separate "Values" sectionJunio C Hamano1-8/+31
2015-03-04Documentation/config.txt: describe the structure first and then meaningJunio C Hamano1-16/+15
2015-03-04Documentation/config.txt: explain multi-valued variables onceJunio C Hamano1-4/+3
2015-03-04Documentation/config.txt: avoid unnecessary negationJunio C Hamano1-3/+3
2015-03-03t5516: correct misspelled pushInsteadOfAnders Kaseorg1-1/+1
2015-03-02submodule: improve documentation of update subcommandMichal Sojka3-37/+64
2015-03-02git-remote.txt: describe behavior without --tags and --no-tagsMichael J Gruber1-0/+3
2015-03-02kwset: use unsigned char to store values with high-bit setBen Walton4-7/+7
2015-03-02diff --shortstat --dirstat: remove duplicate outputMårten Kongstad2-1/+15
2015-02-27diffcore-rename: avoid processing duplicate destinationsJeff King2-2/+85
2015-02-27diffcore-rename: split locate_rename_dst into two functionsJeff King1-12/+26
2015-02-27grep: correct help string for --exclude-standardNguyễn Thái Ngọc Duy1-1/+1
2015-02-26Git::SVN::*: avoid premature FileHandle closureKyle J. McKay2-0/+11
2015-02-26git-svn: fix localtime=true on non-glibc environmentsRyuichi Kokubo1-1/+2
2015-02-26Documentation/git-clean.txt: document that -f may need to be given twiceMikko Rapeli1-2/+6
2015-02-24Git 2.3.1v2.3.1Junio C Hamano4-3/+56
2015-02-24Merge branch 'ak/add-i-empty-candidates' into maintJunio C Hamano1-0/+5
2015-02-24Merge branch 'jc/apply-ws-fix-expands' into maintJunio C Hamano2-3/+149
2015-02-24Merge branch 'jc/doc-log-rev-list-options' into maintJunio C Hamano1-5/+7
2015-02-24Merge branch 'mg/commit-author-no-match-malformed-message' into maintJunio C Hamano1-1/+1
2015-02-24Merge branch 'jk/dumb-http-idx-fetch-fix' into maintJunio C Hamano2-1/+19
2015-02-24Merge branch 'jc/diff-format-doc' into maintJunio C Hamano1-1/+2
2015-02-24Merge branch 'jk/remote-curl-an-array-in-struct-cannot-be-null' into maintJunio C Hamano1-1/+1
2015-02-24Merge branch 'jk/status-read-branch-name-fix' into maintJunio C Hamano1-1/+1
2015-02-24Merge branch 'mg/push-repo-option-doc' into maintJunio C Hamano1-16/+2
2015-02-24Merge branch 'bc/http-fallback-to-password-after-krb-fails' into maintJunio C Hamano1-0/+10
2015-02-24Merge branch 'dk/format-patch-ignore-diff-submodule' into maintJunio C Hamano2-1/+73
2015-02-24Merge branch 'jn/rerere-fail-on-auto-update-failure' into maintJunio C Hamano1-10/+6
2015-02-24Merge branch 'jk/blame-commit-label' into maintJunio C Hamano11-34/+29
2015-02-23test_ln_s_add: refresh stat info of fake symbolic linksJohannes Sixt1-1/+3
2015-02-22git-compat-util.h: remove redundant codeRamsay Jones1-6/+0
2015-02-22t5500: show user name and host in diag-urlTorsten Bögershausen2-30/+56
2015-02-22t5601: add more test cases for IPV6Torsten Bögershausen1-17/+40
2015-02-22connect.c: allow ssh://user@[2001:db8::1]/repo.gitTorsten Bögershausen2-26/+39
2015-02-22sha1_name: use strlcpy() to copy stringsRené Scharfe1-6/+2
2015-02-22pretty: use starts_with() to check for a prefixRené Scharfe1-1/+1
2015-02-22for-each-ref: use skip_prefix() to avoid duplicate string comparisonRené Scharfe1-4/+3
2015-02-22connect: use strcmp() for string comparisonRené Scharfe1-2/+1
2015-02-20Documentation/git-am.txt: mention mailinfo.scissors config variableMatthieu Moy1-1/+2
2015-02-20Documentation/config.txt: document mailinfo.scissorsMatthieu Moy1-0/+7
2015-02-18Git.pm: two minor typo fixesAlexander Kuleshov1-2/+2
2015-02-17daemon: use callback to build interpolated pathRené Scharfe1-9/+45
2015-02-17daemon: look up client-supplied hostname lazilyRené Scharfe1-8/+29
2015-02-17daemon: sanitize incoming virtual hostnameJeff King2-5/+56
2015-02-17t5570: test git-daemon's --interpolated-path optionJeff King1-0/+16
2015-02-17git_connect: let user override virtual-host we send to daemonJeff King1-1/+11
2015-02-17read-cache.c: free cache entry when refreshing failsStefan Beller1-2/+8
2015-02-16git-send-email.perl: support no- prefix with older GetOptionsKyle J. McKay2-5/+15
2015-02-15test-lib.sh: set prerequisite SANITY by testing what we really needTorsten Bögershausen1-3/+22
2015-02-15t4008: modernise styleJunio C Hamano1-160/+126
2015-02-15t/diff-lib: check exact object names in compare_diff_rawJunio C Hamano1-1/+1
2015-02-15tests: do not borrow from COPYING and README from the real sourceJunio C Hamano7-26/+433
2015-02-15t4010: correct expected object namesJunio C Hamano1-1/+1
2015-02-15t9300: correct expected object namesJunio C Hamano1-2/+2
2015-02-15t4008: correct stale commentsJunio C Hamano1-3/+3
2015-02-13hex.c: reduce memory footprint of sha1_to_hex static buffersStefan Beller1-1/+1
2015-02-13do not include the same header twiceДилян Палаузов4-4/+0
2015-02-12transport-helper: fix typo in error message when --signed is not supportedMike Hommey1-1/+1
2015-02-11merge-file: correctly open files when in a subdirAleksander Boruch-Gruszecki2-2/+4
2015-02-10apply: do not touch a file beyond a symbolic linkJunio C Hamano3-4/+203
2015-02-10apply: do not read from beyond a symbolic linkJunio C Hamano2-0/+21
2015-02-10apply: do not read from the filesystem under --indexJunio C Hamano1-1/+1
2015-02-10apply: reject input that touches outside the working areaJunio C Hamano3-1/+178
2015-02-10fast-import: avoid running end_packfile recursivelyJeff King1-1/+5
2015-02-10builtin/blame: destroy initialized commit_info onlyEric Sunshine1-3/+2
2015-02-09sha1_file: fix iterating loose alternate objectsJonathon Mah2-3/+18
2015-02-09for_each_loose_file_in_objdir: take an optional strbuf pathJeff King2-10/+30
2015-02-09git-compat-util: do not step on MAC_OS_X_VERSION_MIN_REQUIREDKyle J. McKay1-3/+6
2015-02-05Git 2.3v2.3.0Junio C Hamano3-1/+12
2015-02-05config_buf_ungetc: warn when pushing back a random characterJeff King1-2/+6
2015-02-05decimal_width: avoid integer overflowJeff King2-5/+5
2015-02-05config: do not ungetc EOFJeff King2-1/+11
2015-02-04ewah: fix building with gcc < 3.4.0Tom G. Christensen1-1/+2
2015-02-03Makefile: handle broken curl version number in version checkTom G. Christensen1-2/+2
2015-02-02git-submodule.sh: fix '/././' path normalizationPatrick Steinhardt2-1/+18
2015-02-02Merge git://github.com/git-l10n/git-poJunio C Hamano1-5/+5
2015-02-02CodingGuidelines: describe naming rules for configuration variablesJunio C Hamano1-0/+23
2015-01-30l10n: ca.po: Fix trailing whitespaceAlex Henrie1-5/+5
2015-01-29Documentation/git-remote.txt: stress that set-url is not for triangularJunio C Hamano1-6/+14
2015-01-29t/lib-gpg: sanity-check that we can actually signJeff King1-0/+2
2015-01-29t/lib-gpg: include separate public keys in keyring.gpgJeff King2-0/+56
2015-01-28diff-format doc: a score can follow M for rewriteJunio C Hamano1-1/+2
2015-01-28git-push.txt: document the behavior of --repoMichael J Gruber1-16/+2
2015-01-28do not check truth value of flex arraysJeff King1-1/+1