summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* comments: fix misuses of "nor"Justin Lebar2014-03-314-4/+4
* Merge branch 'jk/clean-d-pathspec' into maintJunio C Hamano2014-03-181-11/+9
|\
| * clean: simplify dir/not-dir logicjk/clean-d-pathspecJeff King2014-03-111-9/+6
| * clean: respect pathspecs with "-d"Jeff King2014-03-111-2/+3
* | Merge branch 'nd/reset-setup-worktree' into maintJunio C Hamano2014-03-181-3/+4
|\ \
| * | reset: optionally setup worktree and refresh index on --mixednd/reset-setup-worktreeNguyễn Thái Ngọc Duy2014-02-181-3/+4
| |/
| * Merge branch 'bm/merge-base-octopus-dedup' into maintJunio C Hamano2014-02-131-6/+25
| |\
| * \ Merge branch 'sb/repack-in-c' into maintJunio C Hamano2014-02-131-12/+12
| |\ \
| * \ \ Merge branch 'js/lift-parent-count-limit' into maintJunio C Hamano2014-02-051-4/+4
| |\ \ \
| * \ \ \ Merge branch 'nd/add-empty-fix' into maintJunio C Hamano2014-02-051-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'jl/commit-v-strip-marker' into maintJunio C Hamano2014-02-051-6/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'tb/clone-ssh-with-colon-for-port' into maintJunio C Hamano2014-02-051-3/+11
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'nd/transport-positive-depth-only' into maintJunio C Hamano2014-02-052-0/+8
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'jc/check-attr-honor-working-tree' into maintJunio C Hamano2014-03-181-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | check-attr: move to the top of working tree when in non-bare repositoryjc/check-attr-honor-working-treeJunio C Hamano2014-02-061-0/+3
* | | | | | | | | | Merge branch 'ds/rev-parse-required-args' into maintJunio C Hamano2014-03-181-6/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rev-parse: check i before using argv[i] against argcds/rev-parse-required-argsDavid Sharp2014-01-281-6/+11
* | | | | | | | | | | Merge branch 'nd/submodule-pathspec-ending-with-slash' into maintJunio C Hamano2014-03-189-36/+18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | clean: use cache_name_is_other()nd/submodule-pathspec-ending-with-slashNguyễn Thái Ngọc Duy2014-02-241-19/+2
| * | | | | | | | | | | clean: replace match_pathspec() with dir_path_match()Nguyễn Thái Ngọc Duy2014-02-241-2/+1
| * | | | | | | | | | | pathspec: pass directory indicator to match_pathspec_item()Nguyễn Thái Ngọc Duy2014-02-242-3/+4
| * | | | | | | | | | | pathspec: rename match_pathspec_depth() to match_pathspec()Nguyễn Thái Ngọc Duy2014-02-243-5/+7
| * | | | | | | | | | | pathspec: convert some match_pathspec_depth() to dir_path_match()Nguyễn Thái Ngọc Duy2014-02-243-6/+3
| * | | | | | | | | | | pathspec: convert some match_pathspec_depth() to ce_path_match()Nguyễn Thái Ngọc Duy2014-02-245-6/+6
* | | | | | | | | | | | Merge branch 'tb/repack-fix-renames' (early part)Junio C Hamano2014-02-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | repack.c: rename and unlink pack file if it existsTorsten Bögershausen2014-02-051-2/+2
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sb/repack-in-c'Junio C Hamano2014-01-271-12/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | / / / / / / / / / / | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | repack: propagate pack-objects options as stringssb/repack-in-cJeff King2014-01-231-11/+11
| * | | | | | | | | | repack: make parsed string options const-correctJeff King2014-01-231-1/+1
| * | | | | | | | | | repack: fix typo in max-pack-size optionJeff King2014-01-231-1/+1
* | | | | | | | | | | Merge branch 'mh/safe-create-leading-directories'Junio C Hamano2014-01-271-4/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cmd_init_db(): when creating directories, handle errors conservativelyMichael Haggerty2014-01-061-3/+4
| * | | | | | | | | | | safe_create_leading_directories(): introduce enum for return valuesMichael Haggerty2014-01-061-2/+2
* | | | | | | | | | | | Merge branch 'ef/mingw-write'Junio C Hamano2014-01-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | prefer xwrite instead of writeErik Faye-Lund2014-01-171-1/+1
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'km/gc-eperm' into maintJunio C Hamano2014-01-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/mv-file-to-no-such-dir-with-slash' into maintJunio C Hamano2014-01-131-7/+18
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rev-parse-double-dashes' into maintJunio C Hamano2014-01-131-1/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/cat-file-regression-fix' into maintJunio C Hamano2014-01-131-10/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/shallow-clone'Junio C Hamano2014-01-177-74/+309
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | shallow: remove unused codeRamsay Jones2014-01-061-1/+0
| * | | | | | | | | | | | | | | | prune: clean .git/shallow after pruning objectsNguyễn Thái Ngọc Duy2013-12-102-0/+5
| * | | | | | | | | | | | | | | | clone: use git protocol for cloning shallow repo locallyNguyễn Thái Ngọc Duy2013-12-101-2/+9
| * | | | | | | | | | | | | | | | send-pack: support pushing from a shallow clone via httpNguyễn Thái Ngọc Duy2013-12-101-3/+0
| * | | | | | | | | | | | | | | | receive-pack: support pushing to a shallow clone via httpNguyễn Thái Ngọc Duy2013-12-101-3/+0
| * | | | | | | | | | | | | | | | smart-http: support shallow fetch/cloneNguyễn Thái Ngọc Duy2013-12-101-3/+13
| * | | | | | | | | | | | | | | | remote-curl: pass ref SHA-1 to fetch-pack as wellNguyễn Thái Ngọc Duy2013-12-101-0/+7
| * | | | | | | | | | | | | | | | send-pack: support pushing to a shallow cloneNguyễn Thái Ngọc Duy2013-12-101-1/+3
| * | | | | | | | | | | | | | | | receive-pack: allow pushes that update .git/shallowNguyễn Thái Ngọc Duy2013-12-101-13/+150
| * | | | | | | | | | | | | | | | receive/send-pack: support pushing from a shallow cloneNguyễn Thái Ngọc Duy2013-12-102-10/+70