summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* pull: add warning on non-ff mergesfc/discourage-pull-no-ffFelipe Contreras2013-09-101-3/+12
* pull: add merge-ff-only optionFelipe Contreras2013-09-103-3/+53
* pull: add --merge optionFelipe Contreras2013-09-102-3/+11
* pull: refactor $rebase variable into $modeFelipe Contreras2013-09-101-11/+11
* pull: rename pull.rename to pull.modeFelipe Contreras2013-09-107-38/+78
* Update draft release notes to 1.8.5 for the second batch of topicsJunio C Hamano2013-09-091-0/+59
* Merge branch 'nd/magic-pathspec'Junio C Hamano2013-09-094-16/+5
|\
| * add: lift the pathspec magic restriction on "add -p"Nguyễn Thái Ngọc Duy2013-09-052-14/+1
| * pathspec: catch prepending :(prefix) on pathspec with short magicNguyễn Thái Ngọc Duy2013-09-051-1/+3
* | Merge branch 'jk/mailmap-incomplete-line'Junio C Hamano2013-09-092-13/+24
|\ \
| * | mailmap: handle mailmap blobs without trailing newlinesjk/mailmap-incomplete-lineJeff King2013-08-282-13/+24
* | | Merge branch 'sp/clip-read-write-to-8mb'Junio C Hamano2013-09-096-27/+26
|\ \ \
| * | | Revert "compat/clipped-write.c: large write(2) fails on Mac OS X/XNU"sp/clip-read-write-to-8mbSteffen Prohaska2013-08-204-27/+0
| * | | xread, xwrite: limit size of IO to 8MBSteffen Prohaska2013-08-202-0/+26
* | | | Merge branch 'tg/index-struct-sizes'Junio C Hamano2013-09-092-20/+20
|\ \ \ \
| * | | | read-cache: use fixed width integer typestg/index-struct-sizesThomas Gummerer2013-08-202-20/+20
| |/ / /
* | | | Merge branch 'jc/transport-do-not-use-connect-twice-in-fetch'Junio C Hamano2013-09-094-33/+136
|\ \ \ \
| * | | | builtin/fetch.c: Fix a sparse warningjc/transport-do-not-use-connect-twice-in-fetchRamsay Jones2013-08-281-1/+1
| * | | | fetch: work around "transport-take-over" hackJunio C Hamano2013-08-073-0/+21
| * | | | fetch: refactor code that fetches leftover tagsJunio C Hamano2013-08-071-5/+9
| * | | | fetch: refactor code that prepares a transportJunio C Hamano2013-08-071-20/+26
| * | | | fetch: rename file-scope global "transport" to "gtransport"Junio C Hamano2013-08-071-11/+11
| * | | | t5802: add test for connect helperJunio C Hamano2013-08-071-0/+72
* | | | | Merge branch 'es/contacts-blame-L-multi'Junio C Hamano2013-09-091-9/+22
|\ \ \ \ \
| * | | | | contacts: reduce git-blame invocationses/contacts-blame-L-multiEric Sunshine2013-08-131-6/+5
| * | | | | contacts: gather all blame sources prior to invoking git-blameEric Sunshine2013-08-131-5/+20
| * | | | | contacts: validate hunk length earlierEric Sunshine2013-08-131-3/+2
* | | | | | Merge branch 'jc/url-match'Junio C Hamano2013-09-0924-24/+1072
|\ \ \ \ \ \
| * | | | | | builtin/config.c: compilation fixJunio C Hamano2013-08-092-4/+4
| * | | | | | config: "git config --get-urlmatch" parses section.<url>.keyJunio C Hamano2013-08-053-0/+152
| * | | | | | builtin/config: refactor collect_config()Junio C Hamano2013-08-051-21/+21
| * | | | | | config: parse http.<url>.<variable> using urlmatchKyle J. McKay2013-08-0519-1/+309
| * | | | | | config: add generic callback wrapper to parse section.<url>.keyJunio C Hamano2013-07-312-0/+85
| * | | | | | config: add helper to normalize and match URLsKyle J. McKay2013-07-312-0/+504
| * | | | | | http.c: fix parsing of http.sslCertPasswordProtected variableJunio C Hamano2013-07-311-2/+1
* | | | | | | Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-0962-881/+1891
|\ \ \ \ \ \ \
| * | | | | | | rm: delete .gitmodules entry of submodules removed from the work treeJens Lehmann2013-08-067-25/+154
| * | | | | | | mv: update the path entry in .gitmodules for moved submodulesJens Lehmann2013-08-065-1/+121
| * | | | | | | submodule.c: add .gitmodules staging helper functionsJens Lehmann2013-07-302-0/+53
| * | | | | | | mv: move submodules using a gitfileJens Lehmann2013-07-305-5/+73
| * | | | | | | mv: move submodules together with their work treesJens Lehmann2013-07-302-47/+86
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | rm: do not set a variable twice without intermediate reading.Stefan Beller2013-07-231-1/+0
| * | | | | | t6131 - skip tests if on case-insensitive file systemMark Levedahl2013-07-171-0/+6
| * | | | | | parse_pathspec: accept :(icase)path syntaxNguyễn Thái Ngọc Duy2013-07-1511-28/+257
| * | | | | | pathspec: support :(glob) syntaxNguyễn Thái Ngọc Duy2013-07-1512-31/+198
| * | | | | | pathspec: make --literal-pathspecs disable pathspec magicNguyễn Thái Ngọc Duy2013-07-153-3/+9
| * | | | | | pathspec: support :(literal) syntax for noglob pathspecNguyễn Thái Ngọc Duy2013-07-159-15/+64
| * | | | | | kill limit_pathspec_to_literal() as it's only used by parse_pathspec()Nguyễn Thái Ngọc Duy2013-07-153-12/+6
| * | | | | | parse_pathspec: preserve prefix length via PATHSPEC_PREFIX_ORIGINNguyễn Thái Ngọc Duy2013-07-151-5/+36
| * | | | | | parse_pathspec: make sure the prefix part is wildcard-freeNguyễn Thái Ngọc Duy2013-07-155-10/+54
View Lorry Controller Status