summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
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-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-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-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
2013-01-02Merge branch 'sp/shortlog-missing-lf'Libravatar Junio C Hamano1-3/+2
2012-12-13Merge branch 'maint'Libravatar Junio C Hamano1-3/+3
2012-12-13Fix sizeof usage in get_permutationsLibravatar Matthew Daley1-3/+3
2012-12-11shortlog: fix wrapping lines of wraplenLibravatar Steffen Prohaska1-3/+2
2012-12-07Merge branch 'jc/same-encoding' into maintLibravatar Junio C Hamano1-1/+2
2012-12-03fast-export: make sure updated refs get updatedLibravatar Felipe Contreras1-3/+7
2012-12-03fast-export: don't handle uninteresting refsLibravatar Felipe Contreras1-4/+7
2012-12-03push: allow already-exists advice to be disabledLibravatar Chris Rorvick1-0/+2
2012-12-03push: rename config variable for more general useLibravatar Chris Rorvick1-3/+3
2012-12-02push: require force for refs under refs/tags/Libravatar Chris Rorvick2-1/+6
2012-12-02push: add advice for rejected tag referenceLibravatar Chris Rorvick1-0/+11
2012-12-02push: return reject reasons as a bitsetLibravatar Chris Rorvick2-11/+6
2012-11-29Merge branch 'jk/send-email-sender-prompt'Libravatar Junio C Hamano1-2/+2
2012-11-29Merge branch 'jl/submodule-rm'Libravatar Junio C Hamano1-0/+15
2012-11-29fast-export: trivial cleanupLibravatar Felipe Contreras1-1/+1
2012-11-26Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2012-11-26Fix typo in remote set-head usageLibravatar Antoine Pelisse1-1/+1
2012-11-26fast-export: avoid importing blob marksLibravatar Felipe Contreras1-0/+4
2012-11-25Merge branch 'jk/checkout-out-of-unborn' into maintLibravatar Junio C Hamano1-0/+3
2012-11-25Merge branch 'cn/config-missing-path' into maintLibravatar Junio C Hamano1-1/+2
2012-11-23Teach rm to remove submodules when given with a trailing '/'Libravatar Jens Lehmann1-0/+15
2012-11-21Merge branch 'jk/config-ignore-duplicates'Libravatar Junio C Hamano1-65/+43
2012-11-20Merge branch 'jk/checkout-out-of-unborn'Libravatar Junio C Hamano1-0/+3
2012-11-20Merge branch 'cn/config-missing-path'Libravatar Junio C Hamano1-1/+2
2012-11-20Merge branch 'mg/replace-resolve-delete'Libravatar Junio C Hamano1-6/+9
2012-11-20Merge branch 'kb/preload-index-more'Libravatar Junio C Hamano3-6/+15
2012-11-19pathspec: save the non-wildcard length partLibravatar Nguyễn Thái Ngọc Duy2-2/+2
2012-11-18Merge branch 'rs/branch-del-symref' into maintLibravatar Junio C Hamano1-26/+49