summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | mailmap: simplify map_user() interfaceAntoine Pelisse2013-01-102-95/+93
| * | | | Use split_ident_line to parse author and committerAntoine Pelisse2013-01-072-64/+31
* | | | | Merge branch 'jc/blame-no-follow'Junio C Hamano2013-01-141-1/+5
|\ \ \ \ \
| * | | | | blame: pay attention to --no-followJunio C Hamano2012-09-211-1/+5
* | | | | | Merge branch 'jc/merge-blobs'Junio C Hamano2013-01-112-37/+59
|\ \ \ \ \ \
| * | | | | | merge-tree: fix d/f conflictsJunio C Hamano2012-12-261-32/+40
| * | | | | | merge-tree: add comments to clarify what these functions are doingJunio C Hamano2012-12-261-4/+22
| * | | | | | merge-tree: lose unused "resolve_directories"Junio C Hamano2012-12-261-3/+0
| * | | | | | merge-tree: lose unused "flags" from merge_listJunio C Hamano2012-12-261-2/+1
| * | | | | | Which merge_file() function do you mean?Junio C Hamano2012-12-092-4/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jc/format-patch-reroll'Junio C Hamano2013-01-111-9/+24
|\ \ \ \ \ \
| * | | | | | format-patch: give --reroll-count a short synonym -vJunio C Hamano2013-01-031-1/+1
| * | | | | | format-patch: add --reroll-count=$N optionJunio C Hamano2012-12-221-0/+11
| * | | | | | get_patch_filename(): split into two functionsJunio C Hamano2012-12-211-1/+3
| * | | | | | get_patch_filename(): drop "just-numbers" hackJunio C Hamano2012-12-211-1/+4
| * | | | | | get_patch_filename(): simplify function signatureJunio C Hamano2012-12-211-1/+1
| * | | | | | builtin/log.c: stop using global patch_suffixJunio C Hamano2012-12-211-2/+2
| * | | | | | builtin/log.c: drop redundant "numbered_files" parameter from make_cover_lett...Junio C Hamano2012-12-211-7/+6
| * | | | | | builtin/log.c: drop unused "numbered" parameter from make_cover_letter()Junio C Hamano2012-12-211-2/+2
* | | | | | | Merge branch 'jl/interrupt-clone-remove-separate-git-dir'Junio C Hamano2013-01-101-1/+3
|\ \ \ \ \ \ \
View Lorry Controller Status