aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jl/nor-or-nand-and' into maintJunio C Hamano2014-04-09
|\
| * code and test: fix misuses of "nor"Justin Lebar2014-03-31
| * comments: fix misuses of "nor"Justin Lebar2014-03-31
* | Merge branch 'mh/update-ref-batch-create-fix' into maintJunio C Hamano2014-04-09
|\ \
| * | update-ref: fail create operation over stdin if ref already existsAman Gupta2014-04-02
* | | Merge branch 'bp/commit-p-editor' into maintJunio C Hamano2014-04-08
|\ \ \
| * | | merge: fix GIT_EDITOR override for commit hookBenoit Pierre2014-03-18
| * | | commit: fix patch hunk editing with "commit -p -m"Benoit Pierre2014-03-18
| |/ /
* | | Merge branch 'jk/mv-submodules-fix' into maintJunio C Hamano2014-04-03
|\ \ \
| * | | mv: prevent mismatched data when ignoring errors.brian m. carlson2014-03-17
| * | | builtin/mv: fix out of bounds writeJohn Keeping2014-03-11
* | | | Merge branch 'nd/index-pack-error-message' into maintJunio C Hamano2014-04-03
|\ \ \ \
| * | | | index-pack: report error using the correct variableJunio C Hamano2014-03-17
| |/ / /
* | | | Merge branch 'jk/shallow-update-fix' into maintJunio C Hamano2014-04-03
|\ \ \ \ | |_|_|/ |/| | |
| * | | shallow: automatically clean up shallow tempfilesJeff King2014-02-27
| | |/ | |/|
* | | Merge branch 'jk/clean-d-pathspec' into maintJunio C Hamano2014-03-18
|\ \ \
| * | | clean: simplify dir/not-dir logicJeff King2014-03-11
| * | | clean: respect pathspecs with "-d"Jeff King2014-03-11
| | |/ | |/|
* | | Merge branch 'nd/reset-setup-worktree' into maintJunio C Hamano2014-03-18
|\ \ \
| * | | reset: optionally setup worktree and refresh index on --mixedNguyễn Thái Ngọc Duy2014-02-18
| |/ /
| * | Merge branch 'bm/merge-base-octopus-dedup' into maintJunio C Hamano2014-02-13
| |\ \
| * \ \ Merge branch 'sb/repack-in-c' into maintJunio C Hamano2014-02-13
| |\ \ \
| * \ \ \ Merge branch 'js/lift-parent-count-limit' into maintJunio C Hamano2014-02-05
| |\ \ \ \
| * \ \ \ \ Merge branch 'nd/add-empty-fix' into maintJunio C Hamano2014-02-05
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jl/commit-v-strip-marker' into maintJunio C Hamano2014-02-05
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'tb/clone-ssh-with-colon-for-port' into maintJunio C Hamano2014-02-05
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'nd/transport-positive-depth-only' into maintJunio C Hamano2014-02-05
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'jc/check-attr-honor-working-tree' into maintJunio C Hamano2014-03-18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | check-attr: move to the top of working tree when in non-bare repositoryJunio C Hamano2014-02-06
* | | | | | | | | | | Merge branch 'ds/rev-parse-required-args' into maintJunio C Hamano2014-03-18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rev-parse: check i before using argv[i] against argcDavid Sharp2014-01-28
* | | | | | | | | | | | Merge branch 'nd/submodule-pathspec-ending-with-slash' into maintJunio C Hamano2014-03-18
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | clean: use cache_name_is_other()Nguyễn Thái Ngọc Duy2014-02-24
| * | | | | | | | | | | clean: replace match_pathspec() with dir_path_match()Nguyễn Thái Ngọc Duy2014-02-24
| * | | | | | | | | | | pathspec: pass directory indicator to match_pathspec_item()Nguyễn Thái Ngọc Duy2014-02-24
| * | | | | | | | | | | pathspec: rename match_pathspec_depth() to match_pathspec()Nguyễn Thái Ngọc Duy2014-02-24
| * | | | | | | | | | | pathspec: convert some match_pathspec_depth() to dir_path_match()Nguyễn Thái Ngọc Duy2014-02-24
| * | | | | | | | | | | pathspec: convert some match_pathspec_depth() to ce_path_match()Nguyễn Thái Ngọc Duy2014-02-24
* | | | | | | | | | | | Merge branch 'tb/repack-fix-renames' (early part)Junio C Hamano2014-02-05
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | repack.c: rename and unlink pack file if it existsTorsten Bögershausen2014-02-05
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sb/repack-in-c'Junio C Hamano2014-01-27
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | / / / / / / / / / / | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | repack: propagate pack-objects options as stringsJeff King2014-01-23
| * | | | | | | | | | repack: make parsed string options const-correctJeff King2014-01-23
| * | | | | | | | | | repack: fix typo in max-pack-size optionJeff King2014-01-23
* | | | | | | | | | | Merge branch 'mh/safe-create-leading-directories'Junio C Hamano2014-01-27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cmd_init_db(): when creating directories, handle errors conservativelyMichael Haggerty2014-01-06
| * | | | | | | | | | | safe_create_leading_directories(): introduce enum for return valuesMichael Haggerty2014-01-06
* | | | | | | | | | | | Merge branch 'ef/mingw-write'Junio C Hamano2014-01-27
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | prefer xwrite instead of writeErik Faye-Lund2014-01-17
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'km/gc-eperm' into maintJunio C Hamano2014-01-13
| |\ \ \ \ \ \ \ \ \ \ \