summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | reset: update documentation to require only tree-ish with pathsMartin von Zweigbergk2013-01-161-2/+2
| * | | | | | | | | reset [--mixed]: use diff-based reset whether or not pathspec was givenMartin von Zweigbergk2013-01-151-1/+1
| * | | | | | | | | reset: allow reset on unborn branchMartin von Zweigbergk2013-01-151-6/+10
| * | | | | | | | | reset $sha1 $pathspec: require $sha1 only to be treeishMartin von Zweigbergk2013-01-151-21/+27
| * | | | | | | | | reset.c: inline update_index_refresh()Martin von Zweigbergk2013-01-151-9/+5
| * | | | | | | | | reset.c: finish entire cmd_reset() whether or not pathspec is givenMartin von Zweigbergk2013-01-151-24/+18
| * | | | | | | | | reset [--mixed]: only write index file onceMartin von Zweigbergk2013-01-151-9/+5
| * | | | | | | | | reset.c: move lock, write and commit out of update_index_refresh()Martin von Zweigbergk2013-01-151-16/+18
| * | | | | | | | | reset.c: move update_index_refresh() call out of read_from_tree()Martin von Zweigbergk2013-01-151-9/+9
| * | | | | | | | | reset.c: replace switch by if-elseMartin von Zweigbergk2013-01-151-10/+3
| * | | | | | | | | reset: avoid redundant error messageMartin von Zweigbergk2013-01-151-5/+3
| * | | | | | | | | reset --keep: only write index file onceMartin von Zweigbergk2013-01-151-11/+10
| * | | | | | | | | reset.c: share call to die_if_unmerged_cache()Martin von Zweigbergk2013-01-151-8/+6
| * | | | | | | | | reset.c: extract function for updating {ORIG_,}HEADMartin von Zweigbergk2013-01-151-16/+23
| * | | | | | | | | reset.c: remove unnecessary variable 'i'Martin von Zweigbergk2013-01-151-17/+16
| * | | | | | | | | reset.c: extract function for parsing argumentsMartin von Zweigbergk2013-01-151-32/+38
| * | | | | | | | | reset: don't allow "git reset -- $pathspec" in bare repoMartin von Zweigbergk2013-01-151-2/+4
| * | | | | | | | | reset.c: pass pathspec around instead of (prefix, argv) pairMartin von Zweigbergk2013-01-151-17/+10
| * | | | | | | | | reset $pathspec: exit with code 0 if successfulMartin von Zweigbergk2013-01-151-5/+3
| * | | | | | | | | reset $pathspec: no need to discard indexMartin von Zweigbergk2013-01-151-15/+1
* | | | | | | | | | Merge branch 'zk/clean-report-failure'Junio C Hamano2013-01-211-29/+125
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-clean: Display more accurate delete messagesZoltan Klinger2013-01-141-29/+125
* | | | | | | | | | | Merge branch 'nd/clone-no-separate-git-dir-with-bare'Junio C Hamano2013-01-211-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | clone: forbid --bare --separate-git-dir <dir>Nguyễn Thái Ngọc Duy2013-01-101-0/+2
* | | | | | | | | | | | Merge branch 'rt/commit-cleanup-config'Junio C Hamano2013-01-201-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | commit: make default of "cleanup" option configurableRalf Thielow2013-01-101-1/+3
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ap/log-mailmap'Junio C Hamano2013-01-203-137/+116
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | log: add log.mailmap configuration optionAntoine Pelisse2013-01-101-0/+7
| * | | | | | | | | | | | log: add --use-mailmap optionAntoine Pelisse2013-01-101-1/+8
View Lorry Controller Status