summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/fake-ancestor-with-non-blobs'Junio C Hamano2013-02-051-14/+16
|\
| * apply: diagnose incomplete submodule object name betterJunio C Hamano2013-01-311-1/+5
| * apply: simplify build_fake_ancestor()Junio C Hamano2013-01-311-14/+12
* | Merge branch 'jk/read-commit-buffer-data-after-free'Junio C Hamano2013-02-042-30/+6
|\ \
| * | logmsg_reencode: lazily load missing commit buffersJeff King2013-01-261-13/+0
| * | logmsg_reencode: never return NULLJeff King2013-01-262-17/+6
| * | commit: drop useless xstrdup of commit messageJeff King2013-01-261-1/+1
* | | Merge branch 'mm/add-u-A-sans-pathspec'Junio C Hamano2013-02-041-1/+43
|\ \ \
| * | | add: warn when -u or -A is used without pathspecMatthieu Moy2013-01-281-1/+43
* | | | Merge branch 'jc/push-reject-reasons'Junio C Hamano2013-02-042-2/+41
|\ \ \ \
| * | | | push: finishing touches to explain REJECT_ALREADY_EXISTS betterJunio C Hamano2013-01-241-2/+1
| * | | | push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCEJunio C Hamano2013-01-242-0/+40
* | | | | Merge branch 'jk/config-parsing-cleanup'Junio C Hamano2013-02-042-13/+14
|\ \ \ \ \
| * | | | | reflog: use parse_config_key in config callbackJeff King2013-01-231-6/+7
| * | | | | help: use parse_config_key for man configJeff King2013-01-231-7/+7
* | | | | | Merge branch 'jc/custom-comment-char'Junio C Hamano2013-02-047-60/+86
|\ \ \ \ \ \
| * | | | | | Allow custom "comment char"Junio C Hamano2013-01-167-60/+86
* | | | | | | Merge branch 'nd/edit-branch-desc-while-detached'Junio C Hamano2013-02-011-4/+4
|\ \ \ \ \ \ \
| * | | | | | | branch: no detached HEAD check when editing another branch's descriptionNguyễn Thái Ngọc Duy2013-01-301-4/+4
* | | | | | | | Merge branch 'jk/gc-auto-after-fetch'Junio C Hamano2013-02-011-0/+5
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/maint-gc-auto-after-fetch' into jk/gc-auto-after-fetchJunio C Hamano2013-01-261-0/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | fetch-pack: avoid repeatedly re-scanning pack directoryJeff King2013-01-261-0/+3
| | * | | | | | | | fetch: run gc --auto after fetchingJeff King2013-01-261-0/+5
| | |/ / / / / / /
* | | | | | | | | Merge branch 'jc/no-git-config-in-clone'Junio C Hamano2013-02-011-9/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | clone: do not export and unexport GIT_CONFIGJunio C Hamano2013-01-111-9/+0
* | | | | | | | | | Merge branch 'nd/fetch-depth-is-broken'Junio C Hamano2013-02-011-1/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fetch: add --unshallow for turning shallow repo into complete oneNguyễn Thái Ngọc Duy2013-01-111-1/+16
* | | | | | | | | | | Merge branch 'nd/magic-pathspec-from-root'Junio C Hamano2013-01-301-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | grep: avoid accepting ambiguous revisionNguyễn Thái Ngọc Duy2013-01-211-0/+2
* | | | | | | | | | | | Merge branch 'jc/help'Junio C Hamano2013-01-281-18/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | help: include <common-cmds.h> only in one fileJunio C Hamano2013-01-181-18/+0
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'jl/interrupt-clone-remove-separate-git-dir' into maintJunio C Hamano2013-01-141-1/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit' into maintJunio C Hamano2013-01-142-7/+15
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/apply-trailing-blank-removal' into maintJunio C Hamano2013-01-141-6/+17
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' into maintJunio C Hamano2013-01-111-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sp/shortlog-missing-lf' into maintJunio C Hamano2013-01-101-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'as/pre-push-hook'Junio C Hamano2013-01-233-18/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | push: Add support for pre-push hooksAaron Schrab2013-01-181-0/+1
| * | | | | | | | | | | | | | | hooks: Add function to check if a hook existsAaron Schrab2013-01-142-18/+13
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'as/check-ignore'Junio C Hamano2013-01-234-66/+205
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | clean.c, ls-files.c: respect encapsulation of exclude_list_groupsAdam Spiers2013-01-162-8/+13
| * | | | | | | | | | | | | | | add git-check-ignore sub-commandAdam Spiers2013-01-061-0/+173
| * | | | | | | | | | | | | | | add.c: extract new die_if_path_beyond_symlink() for reuseAdam Spiers2013-01-061-4/+6
| * | | | | | | | | | | | | | | add.c: extract check_path_for_gitlink() from treat_gitlinks() for reuseAdam Spiers2013-01-061-18/+6
| * | | | | | | | | | | | | | | pathspec.c: rename newly public functions for clarityAdam Spiers2013-01-061-2/+2
| * | | | | | | | | | | | | | | add.c: move pathspec matchers into new pathspec.c for reuseAdam Spiers2013-01-061-33/+1
| * | | | | | | | | | | | | | | add.c: remove unused argument from validate_pathspec()Adam Spiers2013-01-061-3/+3
| * | | | | | | | | | | | | | | dir.c: keep track of where patterns came fromAdam Spiers2013-01-062-4/+5
| * | | | | | | | | | | | | | | dir.c: use a single struct exclude_list per source of excludesAdam Spiers2013-01-062-4/+7
* | | | | | | | | | | | | | | | Merge branch 'mz/reset-misc'Junio C Hamano2013-01-221-155/+132
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status