summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2015-05-05Merge branch 'oh/fix-config-default-user-name-section'Libravatar Junio C Hamano1-2/+2
2015-05-05Merge branch 'jk/type-from-string-gently'Libravatar Junio C Hamano2-1/+10
2015-05-05Merge branch 'sb/test-bitmap-free-at-end'Libravatar Junio C Hamano1-0/+2
2015-05-05Merge branch 'ld/p4-filetype-detection'Libravatar Junio C Hamano2-6/+6
2015-05-05Merge branch 'ts/checkout-advice-plural'Libravatar Junio C Hamano1-2/+9
2015-05-05Merge branch 'jk/init-core-worktree-at-root'Libravatar Junio C Hamano1-3/+15
2015-05-05Merge branch 'mh/show-branch-topic'Libravatar Junio C Hamano1-3/+3
2015-05-05Merge branch 'sb/line-log-plug-pairdiff-leak'Libravatar Junio C Hamano1-0/+1
2015-05-05Merge branch 'jc/diff-no-index-d-f'Libravatar Junio C Hamano2-2/+98
2015-05-05Merge branch 'bc/object-id'Libravatar Junio C Hamano18-145/+192
2015-05-05git-compat-util.h: implement a different ARRAY_SIZE macro for for safely deri...Libravatar Elia Pinto1-1/+53
2015-05-05daemon: unbreak NO_IPV6 build regressionLibravatar Junio C Hamano1-1/+1
2015-05-05prefix_path(): unconditionally free results in the callersLibravatar Stefan Beller2-13/+10
2015-05-05write_sha1_file(): do not use a separate sha1[] arrayLibravatar Junio C Hamano1-4/+1
2015-05-05t1007: add hash-object --literally testsLibravatar Eric Sunshine1-0/+11
2015-05-05hash-object --literally: fix buffer overrun with extra-long object typeLibravatar Eric Sunshine3-3/+23
2015-05-04config: use error() instead of fprintf(stderr, ...)Libravatar Jonathan Nieder1-2/+2
2015-05-04git-hash-object.txt: document --literally optionLibravatar Eric Sunshine1-2/+8
2015-05-03completion: fix and update 'git log --decorate=' optionsLibravatar SZEDER Gábor1-1/+1
2015-05-03completion: remove redundant __git_compute_all_commands() callLibravatar SZEDER Gábor1-1/+0
2015-05-03pathspec: avoid the need of "--" when wildcard is usedLibravatar Duy Nguyen1-1/+3
2015-05-03blame: CRLF in the working tree and LF in the repoLibravatar Torsten Bögershausen2-3/+16
2015-04-30Git 2.4Libravatar Junio C Hamano2-1/+6
2015-04-29merge: deprecate 'git merge <message> HEAD <commit>' syntaxLibravatar Junio C Hamano7-9/+9
2015-04-29merge: handle FETCH_HEAD internallyLibravatar Junio C Hamano3-39/+81
2015-04-29merge: decide if we auto-generate the message early in collect_parents()Libravatar Junio C Hamano1-7/+9
2015-04-29merge: make collect_parents() auto-generate the merge messageLibravatar Junio C Hamano1-14/+22
2015-04-29merge: extract prepare_merge_message() logic outLibravatar Junio C Hamano1-11/+15
2015-04-29merge: narrow scope of merge_namesLibravatar Junio C Hamano1-4/+7
2015-04-29merge: split reduce_parents() out of collect_parents()Libravatar Junio C Hamano1-16/+25
2015-04-29merge: clarify collect_parents() logicLibravatar Junio C Hamano1-2/+11
2015-04-29merge: small leakfix and code simplificationLibravatar Junio C Hamano1-2/+2
2015-04-29merge: do not check argc to determine number of remote headsLibravatar Junio C Hamano1-3/+2
2015-04-29merge: clarify "pulling into void" special caseLibravatar Junio C Hamano1-17/+18
2015-04-29t5520: test pulling an octopus into an unborn branchLibravatar Junio C Hamano1-0/+9
2015-04-29t5520: style fixesLibravatar Junio C Hamano1-16/+6
2015-04-29merge: simplify code flowLibravatar Junio C Hamano1-8/+8
2015-04-29merge: test the top-level merge driverLibravatar Junio C Hamano1-0/+136
2015-04-29filter-branch: avoid passing commit message through sedLibravatar Jeff King2-1/+19
2015-04-29rebase -i: redo tasks that die during cherry-pickLibravatar Phil Hord2-0/+63
2015-04-28test-lib: turn on GIT_TEST_CHAIN_LINT by defaultLibravatar Jeff King1-1/+1
2015-04-28t7502-commit.sh: fix a broken and-chainLibravatar Ramsay Jones1-1/+1
2015-04-28connect: improve check for plink to reduce false positivesLibravatar brian m. carlson2-3/+48
2015-04-28t5601: fix quotation error leading to skipped testsLibravatar brian m. carlson1-1/+1
2015-04-28connect: simplify SSH connection code pathLibravatar brian m. carlson1-20/+20
2015-04-28test: validate prerequistes syntaxLibravatar Junio C Hamano1-0/+9
2015-04-28Merge branch 'mh/multimail-renewal'Libravatar Junio C Hamano2-24/+25
2015-04-28Merge branch 'mg/show-notes-doc'Libravatar Junio C Hamano1-2/+2
2015-04-28Merge branch 'nd/versioncmp-prereleases'Libravatar Junio C Hamano1-4/+7
2015-04-28Merge branch 'mg/status-v-v'Libravatar Junio C Hamano1-0/+8