summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2013-01-22Merge branch 'mz/reset-misc'Libravatar Junio C Hamano1-155/+132
2013-01-21Merge branch 'zk/clean-report-failure'Libravatar Junio C Hamano1-29/+125
2013-01-21Merge branch 'nd/clone-no-separate-git-dir-with-bare'Libravatar Junio C Hamano1-0/+2
2013-01-20Merge branch 'rt/commit-cleanup-config'Libravatar Junio C Hamano1-1/+3
2013-01-20Merge branch 'ap/log-mailmap'Libravatar Junio C Hamano3-137/+116
2013-01-16reset: update documentation to require only tree-ish with pathsLibravatar Martin von Zweigbergk1-2/+2
2013-01-15reset [--mixed]: use diff-based reset whether or not pathspec was givenLibravatar Martin von Zweigbergk1-1/+1
2013-01-15reset: allow reset on unborn branchLibravatar Martin von Zweigbergk1-6/+10
2013-01-15reset $sha1 $pathspec: require $sha1 only to be treeishLibravatar Martin von Zweigbergk1-21/+27
2013-01-15reset.c: inline update_index_refresh()Libravatar Martin von Zweigbergk1-9/+5
2013-01-15reset.c: finish entire cmd_reset() whether or not pathspec is givenLibravatar Martin von Zweigbergk1-24/+18
2013-01-15reset [--mixed]: only write index file onceLibravatar Martin von Zweigbergk1-9/+5
2013-01-15reset.c: move lock, write and commit out of update_index_refresh()Libravatar Martin von Zweigbergk1-16/+18
2013-01-15reset.c: move update_index_refresh() call out of read_from_tree()Libravatar Martin von Zweigbergk1-9/+9
2013-01-15reset.c: replace switch by if-elseLibravatar Martin von Zweigbergk1-10/+3
2013-01-15reset: avoid redundant error messageLibravatar Martin von Zweigbergk1-5/+3
2013-01-15reset --keep: only write index file onceLibravatar Martin von Zweigbergk1-11/+10
2013-01-15reset.c: share call to die_if_unmerged_cache()Libravatar Martin von Zweigbergk1-8/+6
2013-01-15reset.c: extract function for updating {ORIG_,}HEADLibravatar Martin von Zweigbergk1-16/+23
2013-01-15reset.c: remove unnecessary variable 'i'Libravatar Martin von Zweigbergk1-17/+16
2013-01-15reset.c: extract function for parsing argumentsLibravatar Martin von Zweigbergk1-32/+38
2013-01-15reset: don't allow "git reset -- $pathspec" in bare repoLibravatar Martin von Zweigbergk1-2/+4
2013-01-15reset.c: pass pathspec around instead of (prefix, argv) pairLibravatar Martin von Zweigbergk1-17/+10
2013-01-15reset $pathspec: exit with code 0 if successfulLibravatar Martin von Zweigbergk1-5/+3
2013-01-15reset $pathspec: no need to discard indexLibravatar Martin von Zweigbergk1-15/+1
2013-01-14git-clean: Display more accurate delete messagesLibravatar Zoltan Klinger1-29/+125
2013-01-14Merge branch 'jc/blame-no-follow'Libravatar Junio C Hamano1-1/+5
2013-01-11Merge branch 'jc/merge-blobs'Libravatar Junio C Hamano2-37/+59
2013-01-11Merge branch 'jc/format-patch-reroll'Libravatar Junio C Hamano1-9/+24
2013-01-10clone: forbid --bare --separate-git-dir <dir>Libravatar Nguyễn Thái Ngọc Duy1-0/+2
2013-01-10Merge branch 'jl/interrupt-clone-remove-separate-git-dir'Libravatar Junio C Hamano1-1/+3
2013-01-10Merge branch 'as/dir-c-cleanup'Libravatar Junio C Hamano2-2/+2
2013-01-10Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'Libravatar Junio C Hamano2-7/+15
2013-01-10log: add log.mailmap configuration optionLibravatar Antoine Pelisse1-0/+7
2013-01-10log: add --use-mailmap optionLibravatar Antoine Pelisse1-1/+8
2013-01-10mailmap: simplify map_user() interfaceLibravatar Antoine Pelisse2-95/+93
2013-01-10commit: make default of "cleanup" option configurableLibravatar Ralf Thielow1-1/+3
2013-01-09Merge branch 'nd/maint-branch-desc-doc'Libravatar Junio C Hamano2-14/+24
2013-01-09Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure'Libravatar Junio C Hamano1-2/+3
2013-01-07Use split_ident_line to parse author and committerLibravatar Antoine Pelisse2-64/+31
2013-01-06Merge branch 'jc/apply-trailing-blank-removal'Libravatar Junio C Hamano1-6/+17
2013-01-05Merge branch 'cr/push-force-tag-update'Libravatar Junio C Hamano2-14/+27
2013-01-05Merge branch 'fc/fast-export-fixes'Libravatar Junio C Hamano1-8/+19
2013-01-05Merge branch 'nd/pathspec-wildcard'Libravatar Junio C Hamano2-2/+2
2013-01-05clone: support atomic operation with --separate-git-dirLibravatar Jens Lehmann1-1/+3
2013-01-03format-patch: give --reroll-count a short synonym -vLibravatar Junio C Hamano1-1/+1
2013-01-03merge: Honor prepare-commit-msg return codeLibravatar Antoine Pelisse1-2/+3
2013-01-03format-patch: pick up branch description when no ref is specifiedLibravatar Nguyễn Thái Ngọc Duy1-3/+16
2013-01-03format-patch: pick up correct branch name from symbolic refLibravatar Nguyễn Thái Ngọc Duy1-12/+9
2013-01-03branch: delete branch description if it's emptyLibravatar Nguyễn Thái Ngọc Duy1-1/+1