Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'maint-1.8.5' into maint-1.9 | Junio C Hamano | 2014-07-16 |
|\ | |||
| * | annotate: use argv_array | René Scharfe | 2014-07-16 |
| * | enums: remove trailing ',' after last item in enum | Ronnie Sahlberg | 2014-07-02 |
* | | Merge branch 'jl/nor-or-nand-and' into maint | Junio C Hamano | 2014-04-09 |
|\ \ | |||
| * | | code and test: fix misuses of "nor" | Justin Lebar | 2014-03-31 |
| * | | comments: fix misuses of "nor" | Justin Lebar | 2014-03-31 |
* | | | Merge branch 'mh/update-ref-batch-create-fix' into maint | Junio C Hamano | 2014-04-09 |
|\ \ \ | |||
| * | | | update-ref: fail create operation over stdin if ref already exists | Aman Gupta | 2014-04-02 |
* | | | | Merge branch 'bp/commit-p-editor' into maint | Junio C Hamano | 2014-04-08 |
|\ \ \ \ | |||
| * | | | | merge: fix GIT_EDITOR override for commit hook | Benoit Pierre | 2014-03-18 |
| * | | | | commit: fix patch hunk editing with "commit -p -m" | Benoit Pierre | 2014-03-18 |
| |/ / / | |||
* | | | | Merge branch 'jk/mv-submodules-fix' into maint | Junio C Hamano | 2014-04-03 |
|\ \ \ \ | |||
| * | | | | mv: prevent mismatched data when ignoring errors. | brian m. carlson | 2014-03-17 |
| * | | | | builtin/mv: fix out of bounds write | John Keeping | 2014-03-11 |
| | |_|/ | |/| | | |||
* | | | | Merge branch 'nd/index-pack-error-message' into maint | Junio C Hamano | 2014-04-03 |
|\ \ \ \ | |||
| * | | | | index-pack: report error using the correct variable | Junio C Hamano | 2014-03-17 |
| |/ / / | |||
* | | | | Merge branch 'jk/shallow-update-fix' into maint | Junio C Hamano | 2014-04-03 |
|\ \ \ \ | |_|_|/ |/| | | | |||
| * | | | shallow: automatically clean up shallow tempfiles | Jeff King | 2014-02-27 |
| | |/ | |/| | |||
* | | | Merge branch 'jk/clean-d-pathspec' into maint | Junio C Hamano | 2014-03-18 |
|\ \ \ | |||
| * | | | clean: simplify dir/not-dir logic | Jeff King | 2014-03-11 |
| * | | | clean: respect pathspecs with "-d" | Jeff King | 2014-03-11 |
| | |/ | |/| | |||
* | | | Merge branch 'nd/reset-setup-worktree' into maint | Junio C Hamano | 2014-03-18 |
|\ \ \ | |||
| * | | | reset: optionally setup worktree and refresh index on --mixed | Nguyễn Thái Ngọc Duy | 2014-02-18 |
| |/ / | |||
| * | | Merge branch 'bm/merge-base-octopus-dedup' into maint | Junio C Hamano | 2014-02-13 |
| |\ \ | |||
| * \ \ | Merge branch 'sb/repack-in-c' into maint | Junio C Hamano | 2014-02-13 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'js/lift-parent-count-limit' into maint | Junio C Hamano | 2014-02-05 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'nd/add-empty-fix' into maint | Junio C Hamano | 2014-02-05 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'jl/commit-v-strip-marker' into maint | Junio C Hamano | 2014-02-05 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'tb/clone-ssh-with-colon-for-port' into maint | Junio C Hamano | 2014-02-05 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'nd/transport-positive-depth-only' into maint | Junio C Hamano | 2014-02-05 |
| |\ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ | Merge branch 'jc/check-attr-honor-working-tree' into maint | Junio C Hamano | 2014-03-18 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | check-attr: move to the top of working tree when in non-bare repository | Junio C Hamano | 2014-02-06 |
* | | | | | | | | | | | Merge branch 'ds/rev-parse-required-args' into maint | Junio C Hamano | 2014-03-18 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | rev-parse: check i before using argv[i] against argc | David Sharp | 2014-01-28 |
* | | | | | | | | | | | | Merge branch 'nd/submodule-pathspec-ending-with-slash' into maint | Junio C Hamano | 2014-03-18 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | clean: use cache_name_is_other() | Nguyễn Thái Ngọc Duy | 2014-02-24 |
| * | | | | | | | | | | | clean: replace match_pathspec() with dir_path_match() | Nguyễn Thái Ngọc Duy | 2014-02-24 |
| * | | | | | | | | | | | pathspec: pass directory indicator to match_pathspec_item() | Nguyễn Thái Ngọc Duy | 2014-02-24 |
| * | | | | | | | | | | | pathspec: rename match_pathspec_depth() to match_pathspec() | Nguyễn Thái Ngọc Duy | 2014-02-24 |
| * | | | | | | | | | | | pathspec: convert some match_pathspec_depth() to dir_path_match() | Nguyễn Thái Ngọc Duy | 2014-02-24 |
| * | | | | | | | | | | | pathspec: convert some match_pathspec_depth() to ce_path_match() | Nguyễn Thái Ngọc Duy | 2014-02-24 |
* | | | | | | | | | | | | Merge branch 'tb/repack-fix-renames' (early part) | Junio C Hamano | 2014-02-05 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | repack.c: rename and unlink pack file if it exists | Torsten Bögershausen | 2014-02-05 |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'sb/repack-in-c' | Junio C Hamano | 2014-01-27 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | / / / / / / / / / / | |/ / / / / / / / / / |/| | | | | | | | | | | |||
| * | | | | | | | | | | repack: propagate pack-objects options as strings | Jeff King | 2014-01-23 |
| * | | | | | | | | | | repack: make parsed string options const-correct | Jeff King | 2014-01-23 |
| * | | | | | | | | | | repack: fix typo in max-pack-size option | Jeff King | 2014-01-23 |
* | | | | | | | | | | | Merge branch 'mh/safe-create-leading-directories' | Junio C Hamano | 2014-01-27 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | cmd_init_db(): when creating directories, handle errors conservatively | Michael Haggerty | 2014-01-06 |
| * | | | | | | | | | | | safe_create_leading_directories(): introduce enum for return values | Michael Haggerty | 2014-01-06 |