summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2015-08-19Merge branch 'se/doc-checkout-ours-theirs' into maintLibravatar Junio C Hamano1-0/+15
2015-08-19Merge branch 'cb/uname-in-untracked' into maintLibravatar Junio C Hamano1-1/+1
2015-08-19Merge branch 'as/sparse-checkout-removal' into maintLibravatar Junio C Hamano2-0/+56
2015-08-19Merge branch 'db/send-pack-user-signingkey' into maintLibravatar Junio C Hamano1-0/+3
2015-08-19Merge branch 'jx/do-not-crash-receive-pack-wo-head' into maintLibravatar Junio C Hamano1-1/+1
2015-08-19Merge branch 'da/subtree-date-confusion' into maintLibravatar Junio C Hamano2-1/+5
2015-08-19push: add a config option push.gpgSign for default signed pushesLibravatar Dave Borowitz3-15/+70
2015-08-19push: support signing pushes iff the server supports itLibravatar Dave Borowitz10-49/+128
2015-08-19builtin/send-pack.c: use parse_options APILibravatar Dave Borowitz1-104/+59
2015-08-19config.c: rename git_config_maybe_bool_text and export it as git_parse_maybe_...Libravatar Dave Borowitz2-3/+4
2015-08-19transport: remove git_transport_options.push_certLibravatar Dave Borowitz2-4/+0
2015-08-19gitremote-helpers.txt: document pushcert optionLibravatar Dave Borowitz1-0/+3
2015-08-19Documentation/git-send-pack.txt: document --signedLibravatar Dave Borowitz1-1/+9
2015-08-19Documentation/git-send-pack.txt: wrap long synopsis lineLibravatar Dave Borowitz1-1/+3
2015-08-19Documentation/git-push.txt: document when --signed may failLibravatar Dave Borowitz1-1/+3
2015-08-19submodule: allow erroneous values for the fetchRecurseSubmodules optionLibravatar Heiko Voigt6-17/+66
2015-08-19submodule: use new config API for worktree configurationsLibravatar Heiko Voigt9-138/+104
2015-08-19submodule: extract functions for config set and lookupLibravatar Heiko Voigt1-45/+97
2015-08-19submodule: implement a config API for lookup of .gitmodules valuesLibravatar Heiko Voigt9-0/+671
2015-08-19am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexLibravatar Paul Tan2-13/+60
2015-08-19untracked cache: fix entry invalidationLibravatar Nguyễn Thái Ngọc Duy2-13/+83
2015-08-19untracked-cache: fix subdirectory handlingLibravatar David Turner2-7/+79
2015-08-19t7063: use --force-untracked-cache to speed up a bitLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2015-08-17notes: teach git-notes about notes.<name>.mergeStrategy optionLibravatar Jacob Keller4-1/+64
2015-08-17notes: add notes.mergeStrategy option to select default strategyLibravatar Jacob Keller4-3/+76
2015-08-17notes: add tests for --commit/--abort/--strategy exclusivityLibravatar Jacob Keller1-0/+12
2015-08-17notes: extract parse_notes_merge_strategy to notes-utilsLibravatar Jacob Keller3-11/+20
2015-08-17notes: extract enum notes_merge_strategy to notes-utils.hLibravatar Jacob Keller2-7/+11
2015-08-17notes: document cat_sort_uniq rewriteModeLibravatar Jacob Keller2-4/+5
2015-08-17Third batch for 2.6Libravatar Junio C Hamano1-0/+11
2015-08-17Merge branch 'dt/untracked-sparse'Libravatar Junio C Hamano2-14/+122
2015-08-17Merge branch 'ta/docfix-index-format-tech'Libravatar Junio C Hamano1-1/+1
2015-08-17Merge branch 'mh/get-remote-group-fix'Libravatar Junio C Hamano1-8/+6
2015-08-17Merge branch 'kd/pull-rebase-autostash'Libravatar Junio C Hamano2-1/+16
2015-08-17send-email: provide whitelist of SMTP AUTH mechanismsLibravatar Jan Viktorin2-1/+38
2015-08-17po/README: Update directions for l10n contributorsLibravatar Philip Oakley1-0/+19
2015-08-17http: add support for specifying the SSL versionLibravatar Elia Pinto3-1/+56
2015-08-14config: close config file handle in case of errorLibravatar Sven Strickroth1-1/+4
2015-08-12credential-cache--daemon: use tempfile moduleLibravatar Michael Haggerty1-20/+6
2015-08-12credential-cache--daemon: delete socket from main()Libravatar Michael Haggerty1-1/+2
2015-08-12gc: use tempfile module to handle gc.pid fileLibravatar Michael Haggerty1-20/+5
2015-08-12lock_repo_for_gc(): compute the path to "gc.pid" only onceLibravatar Michael Haggerty1-3/+6
2015-08-12diff: use tempfile moduleLibravatar Michael Haggerty1-23/+23
2015-08-12Second batch for 2.6Libravatar Junio C Hamano1-0/+25
2015-08-12Merge branch 'sb/remove-unused-var-from-builtin-add'Libravatar Junio C Hamano1-2/+0
2015-08-12Merge branch 'sb/parse-options-codeformat'Libravatar Junio C Hamano1-1/+1
2015-08-12Merge branch 'dt/unpack-trees-cache-tree-revalidate'Libravatar Junio C Hamano2-0/+32
2015-08-12Merge branch 'dt/reflog-tests'Libravatar Junio C Hamano11-46/+37
2015-08-12Merge branch 'es/worktree-add-cleanup'Libravatar Junio C Hamano7-126/+213
2015-08-12Merge branch 'pt/am-builtin'Libravatar Junio C Hamano12-15/+2432