summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* blame: allow blame --reverse --first-parent when it makes sensemk/blame-first-parentMax Kirillov2015-10-301-2/+30
* blame: extract find_single_finalMax Kirillov2015-10-301-12/+17
* blame: handle --first-parentjk/blame-first-parentJeff King2015-09-161-1/+10
* Sync with 2.4.9Junio C Hamano2015-09-041-2/+4
|\
| * Sync with 2.3.9Junio C Hamano2015-09-041-2/+4
| |\
| | * Sync with 2.2.3Junio C Hamano2015-09-041-2/+4
| | |\
| | | * show-branch: use a strbuf for reflog descriptionsJeff King2015-09-041-2/+4
* | | | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-upd...Junio C Hamano2015-09-031-3/+1
|\ \ \ \
| * | | | commit: don't rewrite shared index unnecessarilydt/commit-preserve-base-index-upon-opportunistic-cache-tree-updateDavid Turner2015-08-311-3/+1
* | | | | Merge branch 'jc/calloc-pathspec' into maintJunio C Hamano2015-09-032-2/+2
|\ \ \ \ \
| * | | | | ps_matched: xcalloc() takes nmemb and then element sizejc/calloc-pathspecJunio C Hamano2015-08-202-2/+2
| | |/ / / | |/| | |
| * | | | Merge branch 'ss/clone-guess-dir-name-simplify' into maintJunio C Hamano2015-08-031-13/+6
| |\ \ \ \
| * \ \ \ \ Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maintJunio C Hamano2015-08-031-0/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ls/hint-rev-list-count' into maintJunio C Hamano2015-07-271-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/rev-list-no-bitmap-while-pruning' into maintJunio C Hamano2015-07-271-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/index-pack-reduce-recheck' into maintJunio C Hamano2015-07-271-1/+1
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'jk/rev-list-has-no-notes' into maintJunio C Hamano2015-09-031-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rev-list: make it obvious that we do not support notesjk/rev-list-has-no-notesJeff King2015-08-241-0/+3
* | | | | | | | | | | Merge branch 'mh/get-remote-group-fix' into maintJunio C Hamano2015-09-031-8/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | get_remote_group(): use skip_prefix()mh/get-remote-group-fixMichael Haggerty2015-07-281-2/+1
| * | | | | | | | | | get_remote_group(): eliminate superfluous call to strcspn()Michael Haggerty2015-07-281-2/+2
| * | | | | | | | | | get_remote_group(): rename local variable "space" to "wordlen"Michael Haggerty2015-07-281-5/+5
| * | | | | | | | | | get_remote_group(): handle remotes with single-character namesMichael Haggerty2015-07-281-2/+1
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/guess-repo-name-regression-fix' into maintJunio C Hamano2015-08-251-1/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | clone: use computed length in guess_dir_namejk/guess-repo-name-regression-fixJeff King2015-08-101-1/+2
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'sb/remove-unused-var-from-builtin-add' into maintJunio C Hamano2015-08-191-2/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add: remove dead codesb/remove-unused-var-from-builtin-addStefan Beller2015-07-311-2/+0
* | | | | | | | | | Merge branch 'ib/scripted-parse-opt-better-hint-string' into maintJunio C Hamano2015-08-191-27/+30
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rev-parse --parseopt: allow [*=?!] in argument hintsib/scripted-parse-opt-better-hint-stringIlya Bobyr2015-07-151-27/+30
* | | | | | | | | | | Merge branch 'db/send-pack-user-signingkey' into maintJunio C Hamano2015-08-191-0/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | builtin/send-pack.c: respect user.signingkeydb/send-pack-user-signingkeyJunio C Hamano2015-07-211-0/+3
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'mh/fsck-reflog-entries' into maintJunio C Hamano2015-07-151-14/+20
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maintJunio C Hamano2015-07-151-6/+6
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jx/do-not-crash-receive-pack-wo-head' into maintJunio C Hamano2015-08-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | receive-pack: crash when checking with non-exist HEADjx/do-not-crash-receive-pack-wo-headJiang Xin2015-07-221-1/+1
* | | | | | | | | | | | | | Merge branch 'es/worktree-add'Junio C Hamano2015-07-132-153/+199
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Revert "checkout: retire --ignore-other-worktrees in favor of --force"Junio C Hamano2015-07-122-4/+6
| * | | | | | | | | | | | | | checkout: retire --ignore-other-worktrees in favor of --forceEric Sunshine2015-07-072-6/+4
| * | | | | | | | | | | | | | worktree: add: auto-vivify new branch when <branch> is omittedEric Sunshine2015-07-071-2/+6
| * | | | | | | | | | | | | | worktree: add: make -b/-B default to HEAD when <branch> is omittedEric Sunshine2015-07-061-2/+4
| * | | | | | | | | | | | | | worktree: extract basename computation to new functionEric Sunshine2015-07-061-9/+20
| * | | | | | | | | | | | | | checkout: require worktree unconditionallyEric Sunshine2015-07-061-2/+0
| * | | | | | | | | | | | | | checkout: retire --to optionEric Sunshine2015-07-062-166/+139
| * | | | | | | | | | | | | | worktree: add -b/-B optionsEric Sunshine2015-07-061-0/+11
| * | | | | | | | | | | | | | worktree: add --detach optionEric Sunshine2015-07-061-1/+4
| * | | | | | | | | | | | | | worktree: add --force optionEric Sunshine2015-07-061-1/+5
| * | | | | | | | | | | | | | worktree: introduce "add" commandEric Sunshine2015-07-061-0/+31
| * | | | | | | | | | | | | | checkout: drop 'checkout_opts' dependency from prepare_linked_checkoutEric Sunshine2015-07-061-4/+5
| * | | | | | | | | | | | | | checkout: make --to unconditionally verboseEric Sunshine2015-07-061-2/+1
| * | | | | | | | | | | | | | checkout: prepare_linked_checkout: drop now-unused 'new' argumentEric Sunshine2015-07-061-3/+2