aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'as/pre-push-hook'Junio C Hamano2013-01-23
|\
| * push: Add support for pre-push hooksAaron Schrab2013-01-18
| * hooks: Add function to check if a hook existsAaron Schrab2013-01-14
* | Merge branch 'as/check-ignore'Junio C Hamano2013-01-23
|\ \
| * | clean.c, ls-files.c: respect encapsulation of exclude_list_groupsAdam Spiers2013-01-16
| * | add git-check-ignore sub-commandAdam Spiers2013-01-06
| * | add.c: extract new die_if_path_beyond_symlink() for reuseAdam Spiers2013-01-06
| * | add.c: extract check_path_for_gitlink() from treat_gitlinks() for reuseAdam Spiers2013-01-06
| * | pathspec.c: rename newly public functions for clarityAdam Spiers2013-01-06
| * | add.c: move pathspec matchers into new pathspec.c for reuseAdam Spiers2013-01-06
| * | add.c: remove unused argument from validate_pathspec()Adam Spiers2013-01-06
| * | dir.c: keep track of where patterns came fromAdam Spiers2013-01-06
| * | dir.c: use a single struct exclude_list per source of excludesAdam Spiers2013-01-06
* | | Merge branch 'mz/reset-misc'Junio C Hamano2013-01-22
|\ \ \
| * | | reset: update documentation to require only tree-ish with pathsMartin von Zweigbergk2013-01-16
| * | | reset [--mixed]: use diff-based reset whether or not pathspec was givenMartin von Zweigbergk2013-01-15
| * | | reset: allow reset on unborn branchMartin von Zweigbergk2013-01-15
| * | | reset $sha1 $pathspec: require $sha1 only to be treeishMartin von Zweigbergk2013-01-15
| * | | reset.c: inline update_index_refresh()Martin von Zweigbergk2013-01-15
| * | | reset.c: finish entire cmd_reset() whether or not pathspec is givenMartin von Zweigbergk2013-01-15
| * | | reset [--mixed]: only write index file onceMartin von Zweigbergk2013-01-15
| * | | reset.c: move lock, write and commit out of update_index_refresh()Martin von Zweigbergk2013-01-15
| * | | reset.c: move update_index_refresh() call out of read_from_tree()Martin von Zweigbergk2013-01-15
| * | | reset.c: replace switch by if-elseMartin von Zweigbergk2013-01-15
| * | | reset: avoid redundant error messageMartin von Zweigbergk2013-01-15
| * | | reset --keep: only write index file onceMartin von Zweigbergk2013-01-15
| * | | reset.c: share call to die_if_unmerged_cache()Martin von Zweigbergk2013-01-15
| * | | reset.c: extract function for updating {ORIG_,}HEADMartin von Zweigbergk2013-01-15
| * | | reset.c: remove unnecessary variable 'i'Martin von Zweigbergk2013-01-15
| * | | reset.c: extract function for parsing argumentsMartin von Zweigbergk2013-01-15
| * | | reset: don't allow "git reset -- $pathspec" in bare repoMartin von Zweigbergk2013-01-15
| * | | reset.c: pass pathspec around instead of (prefix, argv) pairMartin von Zweigbergk2013-01-15
| * | | reset $pathspec: exit with code 0 if successfulMartin von Zweigbergk2013-01-15
| * | | reset $pathspec: no need to discard indexMartin von Zweigbergk2013-01-15
* | | | Merge branch 'zk/clean-report-failure'Junio C Hamano2013-01-21
|\ \ \ \
| * | | | git-clean: Display more accurate delete messagesZoltan Klinger2013-01-14
* | | | | Merge branch 'nd/clone-no-separate-git-dir-with-bare'Junio C Hamano2013-01-21
|\ \ \ \ \
| * | | | | clone: forbid --bare --separate-git-dir <dir>Nguyễn Thái Ngọc Duy2013-01-10
* | | | | | Merge branch 'rt/commit-cleanup-config'Junio C Hamano2013-01-20
|\ \ \ \ \ \
| * | | | | | commit: make default of "cleanup" option configurableRalf Thielow2013-01-10
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ap/log-mailmap'Junio C Hamano2013-01-20
|\ \ \ \ \ \
| * | | | | | log: add log.mailmap configuration optionAntoine Pelisse2013-01-10
| * | | | | | log: add --use-mailmap optionAntoine Pelisse2013-01-10
| * | | | | | mailmap: simplify map_user() interfaceAntoine Pelisse2013-01-10
| * | | | | | Use split_ident_line to parse author and committerAntoine Pelisse2013-01-07
* | | | | | | Merge branch 'jc/blame-no-follow'Junio C Hamano2013-01-14
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | blame: pay attention to --no-followJunio C Hamano2012-09-21
* | | | | | | Merge branch 'jc/merge-blobs'Junio C Hamano2013-01-11
|\ \ \ \ \ \ \
| * | | | | | | merge-tree: fix d/f conflictsJunio C Hamano2012-12-26
| * | | | | | | merge-tree: add comments to clarify what these functions are doingJunio C Hamano2012-12-26