summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'hu/cherry-pick-previous-branch'Junio C Hamano2013-09-201-0/+2
|\
| * cherry-pick: allow "-" as abbreviation of '@{-1}'Hiroshige Umino2013-09-091-0/+2
* | Merge branch 'mm/status-without-comment-char'Junio C Hamano2013-09-202-4/+14
|\ \
| * | status: disable display of '#' comment prefix by defaultMatthieu Moy2013-09-061-0/+10
| * | builtin/stripspace.c: fix broken indentationMatthieu Moy2013-09-061-4/+4
* | | Merge branch 'jx/branch-vv-always-compare-with-upstream'Junio C Hamano2013-09-201-15/+21
|\ \ \
| * | | branch: report invalid tracking branch as goneJiang Xin2013-08-261-15/+21
| |/ /
* | | Merge branch 'nd/fetch-into-shallow'Junio C Hamano2013-09-202-2/+2
|\ \ \
| * | | list-objects: reduce one argument in mark_edges_uninterestingNguyễn Thái Ngọc Duy2013-08-282-2/+2
| |/ /
* | | Merge branch 'rh/ishes-doc'Junio C Hamano2013-09-172-3/+3
|\ \ \
| * | | use 'commit-ish' instead of 'committish'Richard Hansen2013-09-042-3/+3
| |/ /
* | | Merge branch 'fc/trivial'Junio C Hamano2013-09-172-12/+9
|\ \ \
| * | | add: trivial style cleanupFelipe Contreras2013-08-301-5/+5
| * | | reset: trivial style cleanupFelipe Contreras2013-08-301-1/+1
| * | | reset: trivial refactoringFelipe Contreras2013-08-301-6/+3
* | | | Merge branch 'fc/fast-export'Junio C Hamano2013-09-171-40/+47
|\ \ \ \
| * | | | fast-export: refactor get_tags_and_duplicates()fc/fast-exportFelipe Contreras2013-09-031-30/+38
| * | | | fast-export: make extra_refs globalFelipe Contreras2013-09-031-11/+10
| | |/ / | |/| |
* | | | Merge branch 'ap/commit-author-mailmap'Junio C Hamano2013-09-171-1/+7
|\ \ \ \
| * | | | commit: search author pattern against mailmapap/commit-author-mailmapAntoine Pelisse2013-08-241-1/+7
| |/ / /
* | | | Merge branch 'jk/free-tree-buffer'Junio C Hamano2013-09-173-11/+10
|\ \ \ \
| * | | | clear parsed flag when we free tree buffersjk/free-tree-bufferJeff King2013-06-063-11/+10
* | | | | Merge branch 'jk/config-int-range-check'Junio C Hamano2013-09-121-3/+4
|\ \ \ \ \
| * | | | | git-config: always treat --int as 64-bit internallyJeff King2013-09-091-3/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'jc/ls-files-killed-optim'Junio C Hamano2013-09-111-0/+2
|\ \ \ \ \
| * | | | | ls-files -k: a directory only can be killed if the index has a non-directoryJunio C Hamano2013-08-151-0/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'nd/push-no-thin'Junio C Hamano2013-09-112-4/+9
|\ \ \ \ \
| * | | | | push: respect --no-thinnd/push-no-thinNguyễn Thái Ngọc Duy2013-08-132-4/+9
| | |/ / / | |/| | |
* | | | | Merge branch 'nd/magic-pathspec'Junio C Hamano2013-09-092-14/+1
|\ \ \ \ \
| * | | | | add: lift the pathspec magic restriction on "add -p"Nguyễn Thái Ngọc Duy2013-09-052-14/+1
* | | | | | Merge branch 'jc/transport-do-not-use-connect-twice-in-fetch'Junio C Hamano2013-09-091-33/+56
|\ \ \ \ \ \
| * | | | | | 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-071-0/+13
| * | | | | | 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
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jc/url-match'Junio C Hamano2013-09-091-21/+119
|\ \ \ \ \ \
| * | | | | | builtin/config.c: compilation fixJunio C Hamano2013-08-091-1/+1
| * | | | | | config: "git config --get-urlmatch" parses section.<url>.keyJunio C Hamano2013-08-051-0/+98
| * | | | | | builtin/config: refactor collect_config()Junio C Hamano2013-08-051-21/+21
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-0918-320/+360
|\ \ \ \ \ \
| * | | | | | rm: delete .gitmodules entry of submodules removed from the work treeJens Lehmann2013-08-061-3/+16
| * | | | | | mv: update the path entry in .gitmodules for moved submodulesJens Lehmann2013-08-061-1/+9
| * | | | | | mv: move submodules using a gitfileJens Lehmann2013-07-301-4/+15
| * | | | | | mv: move submodules together with their work treesJens Lehmann2013-07-301-47/+52
| | |_|/ / / | |/| | | |
| * | | | | rm: do not set a variable twice without intermediate reading.Stefan Beller2013-07-231-1/+0
| * | | | | parse_pathspec: accept :(icase)path syntaxNguyễn Thái Ngọc Duy2013-07-152-3/+5
| * | | | | pathspec: support :(glob) syntaxNguyễn Thái Ngọc Duy2013-07-152-3/+8
| * | | | | pathspec: support :(literal) syntax for noglob pathspecNguyễn Thái Ngọc Duy2013-07-152-2/+2
| * | | | | rename field "raw" to "_raw" in struct pathspecNguyễn Thái Ngọc Duy2013-07-151-1/+1