summaryrefslogtreecommitdiff
path: root/builtin
AgeCommit message (Expand)AuthorFilesLines
2013-07-15Merge branch 'jk/format-patch-from'Libravatar Junio C Hamano1-0/+24
2013-07-15Merge branch 'mv/merge-ff-tristate'Libravatar Junio C Hamano1-22/+33
2013-07-12Merge branch 'ms/remote-tracking-branches-in-doc'Libravatar Junio C Hamano2-3/+3
2013-07-12Merge branch 'jk/pull-to-integrate'Libravatar Junio C Hamano1-6/+6
2013-07-12Merge branch 'as/log-output-encoding-in-user-format'Libravatar Junio C Hamano3-1/+6
2013-07-11Merge branch 'jg/status-config'Libravatar Junio C Hamano1-19/+64
2013-07-11Merge branch 'rr/rebase-checkout-reflog'Libravatar Junio C Hamano1-3/+8
2013-07-11Merge branch 'jc/triangle-push-fixup'Libravatar Junio C Hamano1-12/+31
2013-07-07push: avoid suggesting "merging" remote changesLibravatar John Keeping1-6/+6
2013-07-03Change "remote tracking" to "remote-tracking"Libravatar Michael Schubert2-3/+3
2013-07-03teach format-patch to place other authors into in-body "From"Libravatar Jeff King1-0/+24
2013-07-02merge: handle --ff/--no-ff/--ff-only as a tri-state optionLibravatar Miklos Vajna1-22/+33
2013-07-01Merge branch 'jc/topo-author-date-sort'Libravatar Junio C Hamano2-7/+9
2013-06-30Merge branch 'mh/ref-races'Libravatar Junio C Hamano2-6/+11
2013-06-30Merge branch 'nk/name-rev-abbreviated-refs'Libravatar Junio C Hamano1-7/+29
2013-06-30Merge branch 'jk/submodule-subdirectory-ok'Libravatar Junio C Hamano1-5/+19
2013-06-28Merge branch 'nd/clone-connectivity-shortcut' (early part) into maintLibravatar Junio C Hamano1-0/+4
2013-06-27Merge branch 'rr/push-head' into maintLibravatar Junio C Hamano1-7/+14
2013-06-27Merge branch 'rs/commit-m-no-edit' into maintLibravatar Junio C Hamano1-4/+6
2013-06-27Merge branch 'jh/checkout-auto-tracking' into maintLibravatar Junio C Hamano1-20/+22
2013-06-27Merge branch 'bc/checkout-tracking-name-plug-leak'Libravatar Junio C Hamano1-2/+5
2013-06-26Merge branch 'tr/maint-apply-non-git-patch-parsefix'Libravatar Junio C Hamano1-1/+1
2013-06-26Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'Libravatar Junio C Hamano3-4/+2
2013-06-26pretty: --format output should honor logOutputEncodingLibravatar Alexey Shumkin3-1/+6
2013-06-24Merge branch 'mm/rm-coalesce-errors'Libravatar Junio C Hamano1-19/+82
2013-06-24Merge branch 'jh/libify-note-handling'Libravatar Junio C Hamano2-133/+6
2013-06-24status/commit: make sure --porcelain is not affected by user-facing configLibravatar Junio C Hamano1-22/+55
2013-06-24commit: make it work with status.shortLibravatar Ramkumar Ramachandra1-0/+1
2013-06-24status: introduce status.branch to enable --branch by defaultLibravatar Jorge Juan Garcia Garcia1-0/+4
2013-06-24status: introduce status.short to enable --short by defaultLibravatar Jorge Juan Garcia Garcia1-0/+7
2013-06-24push: change `simple` to accommodate triangular workflowsLibravatar Ramkumar Ramachandra1-12/+31
2013-06-24Revert "Merge branch 'jg/status-config'"Libravatar Junio C Hamano1-11/+0
2013-06-23Merge branch 'jg/status-config'Libravatar Junio C Hamano1-0/+11
2013-06-21apply: carefully strdup a possibly-NULL nameLibravatar Thomas Rast1-1/+1
2013-06-20Merge branch 'rs/logical-vs-binary-or'Libravatar Junio C Hamano3-6/+6
2013-06-20Merge branch 'mm/color-auto-default'Libravatar Junio C Hamano1-0/+5
2013-06-20Extract a struct stat_data from cache_entryLibravatar Michael Haggerty1-5/+7
2013-06-20refs: implement simple transactions for the packed-refs fileLibravatar Michael Haggerty1-1/+4
2013-06-18name-rev: allow to specify a subpath for --refs optionLibravatar Namhyung Kim1-7/+29
2013-06-18fix "builtin-*" references to be "builtin/*"Libravatar Phil Hord3-4/+2
2013-06-18builtin/checkout.c: don't leak memory in check_tracking_nameLibravatar Brandon Casey1-2/+5
2013-06-17rev-parse: add --prefix optionLibravatar John Keeping1-5/+19
2013-06-17checkout: respect GIT_REFLOG_ACTIONLibravatar Ramkumar Ramachandra1-3/+8
2013-06-15status: introduce status.branch to enable --branch by defaultLibravatar Jorge Juan Garcia Garcia1-0/+4
2013-06-14Merge branch 'mh/reflife'Libravatar Junio C Hamano5-51/+57
2013-06-13use logical OR (||) instead of binary OR (|) in logical contextLibravatar René Scharfe3-6/+6
2013-06-12rm: introduce advice.rmHints to shorten messagesLibravatar Mathieu Lienard--Mayor1-1/+2
2013-06-12rm: better error message on failure for multiple filesLibravatar Mathieu Lienard--Mayor1-19/+81
2013-06-12Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.cLibravatar Johan Herland2-130/+2
2013-06-12finish_copy_notes_for_rewrite(): Let caller provide commit messageLibravatar Johan Herland2-5/+6