summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'pt/pull-builtin'Junio C Hamano2015-08-031-0/+882
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pull: remove redirection to git-pull.shPaul Tan2015-06-181-7/+0
| * | | | | | | | | pull --rebase: error on no merge candidate casesPaul Tan2015-06-181-3/+12
| * | | | | | | | | pull --rebase: exit early when the working directory is dirtyPaul Tan2015-06-181-1/+76
| * | | | | | | | | pull: configure --rebase via branch.<name>.rebase or pull.rebasePaul Tan2015-06-181-1/+34
| * | | | | | | | | pull: teach git pull about --rebasePaul Tan2015-06-181-2/+245
| * | | | | | | | | pull: set reflog messagePaul Tan2015-06-181-0/+22
| * | | | | | | | | pull: implement pulling into an unborn branchPaul Tan2015-06-181-1/+28
| * | | | | | | | | pull: fast-forward working tree if head is updatedPaul Tan2015-06-181-0/+30
| * | | | | | | | | pull: check if in unresolved merge statePaul Tan2015-06-181-0/+9
| * | | | | | | | | pull: support pull.ff configPaul Tan2015-06-181-0/+29
| * | | | | | | | | pull: error on no merge candidatesPaul Tan2015-06-181-0/+113
| * | | | | | | | | pull: pass git-fetch's options to git-fetchPaul Tan2015-06-181-0/+95
| * | | | | | | | | pull: pass git-merge's options to git-mergePaul Tan2015-06-151-0/+75
| * | | | | | | | | pull: pass verbosity, --progress flags to fetch and mergePaul Tan2015-06-151-0/+36
| * | | | | | | | | pull: implement fetch + mergePaul Tan2015-06-151-1/+61
| * | | | | | | | | pull: implement skeletal builtin pullPaul Tan2015-06-151-0/+33
* | | | | | | | | | Merge branch 'ee/clean-remove-dirs'Junio C Hamano2015-08-031-4/+26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | clean: improve performance when removing lots of directoriesErik Elfström2015-06-151-4/+26
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'cb/parse-magnitude'Junio C Hamano2015-08-031-21/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | parse-options: move unsigned long option parsing out of pack-objects.ccb/parse-magnitudeCharles Bailey2015-06-221-21/+4
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'bc/gpg-verify-raw'Junio C Hamano2015-08-032-20/+35
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | verify-tag: add option to print raw gpg status informationbc/gpg-verify-rawbrian m. carlson2015-06-221-6/+11
| * | | | | | | | | | verify-commit: add option to print raw gpg status informationbrian m. carlson2015-06-221-5/+10
| * | | | | | | | | | gpg: centralize printing signature buffersbrian m. carlson2015-06-222-10/+6
| * | | | | | | | | | gpg: centralize signature checkbrian m. carlson2015-06-222-4/+6
| * | | | | | | | | | verify-tag: share code with verify-commitbrian m. carlson2015-06-221-1/+8
* | | | | | | | | | | Merge branch 'kn/for-each-ref'Junio C Hamano2015-08-031-1094/+19
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | for-each-ref: introduce filter_refs()Karthik Nayak2015-08-031-10/+11
| * | | | | | | | | | | ref-filter: move code from 'for-each-ref'Karthik Nayak2015-08-031-1074/+0
| * | | | | | | | | | | ref-filter: add 'ref-filter.h'Karthik Nayak2015-06-151-40/+1
| * | | | | | | | | | | for-each-ref: rename variables called sort to sortingKarthik Nayak2015-06-151-14/+14
| * | | | | | | | | | | for-each-ref: rename some functions and make them publicKarthik Nayak2015-06-151-32/+32
| * | | | | | | | | | | for-each-ref: introduce 'ref_array_clear()'Karthik Nayak2015-06-151-0/+21
| * | | | | | | | | | | for-each-ref: introduce new structures for better organisationKarthik Nayak2015-06-151-24/+30
| * | | | | | | | | | | for-each-ref: rename 'refinfo' to 'ref_array_item'Karthik Nayak2015-06-151-20/+20
| * | | | | | | | | | | for-each-ref: clean up codeKarthik Nayak2015-06-151-5/+2
| * | | | | | | | | | | for-each-ref: extract helper functions out of grab_single_ref()Karthik Nayak2015-06-151-23/+41
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'mh/replace-refs'Junio C Hamano2015-08-031-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Allow to control where the replace refs are looked formh/replace-refsMike Hommey2015-06-121-3/+3
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | 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
View Lorry Controller Status