summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge branch 'jk/trailing-slash-in-pathspec'Junio C Hamano2013-10-172-18/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | reset: handle submodule with trailing slashjk/trailing-slash-in-pathspecJohn Keeping2013-09-131-2/+6
| * | | | | | | | | | | | rm: re-use parse_pathspec's trailing-slash removalJohn Keeping2013-09-131-16/+4
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-10-151-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | / / / / | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | clone --branch: refuse to clone if upstream repo is emptyRalf Thielow2013-10-141-0/+4
* | | | | | | | | | | | Merge branch 'po/remote-set-head-usage'Jonathan Nieder2013-10-141-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | remote set-head -h: add long options to synopsispo/remote-set-head-usagePhilip Oakley2013-09-271-2/+2
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'cc/replace-with-the-same-type'Jonathan Nieder2013-09-241-3/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | replace: allow long option namesChristian Couder2013-09-061-3/+3
| * | | | | | | | | | | replace: forbid replacing an object with one of a different typeChristian Couder2013-09-061-0/+10
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/shortlog-tolerate-broken-commit'Jonathan Nieder2013-09-241-2/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | shortlog: ignore commits with missing authorsjk/shortlog-tolerate-broken-commitJeff King2013-09-181-2/+4
* | | | | | | | | | | | clone: add a period after "done" to end the sentenceSebastian Schuberth2013-09-241-1/+1
* | | | | | | | | | | | Merge branch 'dw/check-ignore-sans-index'Junio C Hamano2013-09-201-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | check-ignore: Add option to ignore index contentsdw/check-ignore-sans-indexDave Williams2013-09-121-2/+4
* | | | | | | | | | | | | Merge branch 'mm/commit-template-squelch-advice-messages'Junio C Hamano2013-09-201-8/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | commit: disable status hints when writing to COMMIT_EDITMSGmm/commit-template-squelch-advice-messagesMatthieu Moy2013-09-121-0/+6
| * | | | | | | | | | | | | wt-status: turn advice_status_hints into a field of wt_statusMatthieu Moy2013-09-121-0/+1
| * | | | | | | | | | | | | commit: factor status configuration is a helper functionMatthieu Moy2013-09-121-8/+10
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'bk/refs-multi-update'Junio C Hamano2013-09-208-9/+261
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | update-ref: support multiple simultaneous updatesBrad King2013-09-091-1/+251
| * | | | | | | | | | | | | refs: report ref type from lock_any_ref_for_updateBrad King2013-08-306-6/+8
| * | | | | | | | | | | | | reset: rename update_refs to reset_refsBrad King2013-08-301-2/+2
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'hu/cherry-pick-previous-branch'Junio C Hamano2013-09-201-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | cherry-pick: allow "-" as abbreviation of '@{-1}'Hiroshige Umino2013-09-091-0/+2
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'mm/status-without-comment-char'Junio C Hamano2013-09-202-4/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | status: disable display of '#' comment prefix by defaultMatthieu Moy2013-09-061-0/+10
| * | | | | | | | | | | | builtin/stripspace.c: fix broken indentationMatthieu Moy2013-09-061-4/+4
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jx/branch-vv-always-compare-with-upstream'Junio C Hamano2013-09-201-15/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | branch: report invalid tracking branch as goneJiang Xin2013-08-261-15/+21
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'nd/fetch-into-shallow'Junio C Hamano2013-09-202-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | list-objects: reduce one argument in mark_edges_uninterestingNguyễn Thái Ngọc Duy2013-08-282-2/+2
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'rh/ishes-doc'Junio C Hamano2013-09-172-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | use 'commit-ish' instead of 'committish'Richard Hansen2013-09-042-3/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'fc/trivial'Junio C Hamano2013-09-172-12/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add: trivial style cleanupFelipe Contreras2013-08-301-5/+5
| * | | | | | | | | | | reset: trivial style cleanupFelipe Contreras2013-08-301-1/+1
| * | | | | | | | | | | reset: trivial refactoringFelipe Contreras2013-08-301-6/+3
* | | | | | | | | | | | Merge branch 'fc/fast-export'Junio C Hamano2013-09-171-40/+47
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fast-export: refactor get_tags_and_duplicates()fc/fast-exportFelipe Contreras2013-09-031-30/+38
| * | | | | | | | | | | | fast-export: make extra_refs globalFelipe Contreras2013-09-031-11/+10
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ap/commit-author-mailmap'Junio C Hamano2013-09-171-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | commit: search author pattern against mailmapap/commit-author-mailmapAntoine Pelisse2013-08-241-1/+7
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jk/free-tree-buffer'Junio C Hamano2013-09-173-11/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | clear parsed flag when we free tree buffersjk/free-tree-bufferJeff King2013-06-063-11/+10
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/config-int-range-check'Junio C Hamano2013-09-121-3/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-config: always treat --int as 64-bit internallyJeff King2013-09-091-3/+4
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/ls-files-killed-optim'Junio C Hamano2013-09-111-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ls-files -k: a directory only can be killed if the index has a non-directoryJunio C Hamano2013-08-151-0/+2
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'nd/push-no-thin'Junio C Hamano2013-09-112-4/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |