summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jg/status-config'Junio C Hamano2013-07-111-19/+64
|\
| * status/commit: make sure --porcelain is not affected by user-facing configJunio C Hamano2013-06-241-22/+55
| * commit: make it work with status.shortRamkumar Ramachandra2013-06-241-0/+1
| * status: introduce status.branch to enable --branch by defaultJorge Juan Garcia Garcia2013-06-241-0/+4
| * status: introduce status.short to enable --short by defaultJorge Juan Garcia Garcia2013-06-241-0/+7
* | Merge branch 'rr/rebase-checkout-reflog'Junio C Hamano2013-07-111-3/+8
|\ \
| * | checkout: respect GIT_REFLOG_ACTIONRamkumar Ramachandra2013-06-171-3/+8
| |/
* | Merge branch 'jc/triangle-push-fixup'Junio C Hamano2013-07-111-12/+31
|\ \
| * | push: change `simple` to accommodate triangular workflowsRamkumar Ramachandra2013-06-241-12/+31
* | | Merge branch 'jc/topo-author-date-sort'Junio C Hamano2013-07-012-7/+9
|\ \ \
| * | | toposort: rename "lifo" fieldJunio C Hamano2013-06-112-7/+9
* | | | Merge branch 'mh/ref-races'Junio C Hamano2013-06-302-6/+11
|\ \ \ \
| * | | | Extract a struct stat_data from cache_entryMichael Haggerty2013-06-201-5/+7
| * | | | refs: implement simple transactions for the packed-refs fileMichael Haggerty2013-06-201-1/+4
| | |/ / | |/| |
* | | | Merge branch 'nk/name-rev-abbreviated-refs'Junio C Hamano2013-06-301-7/+29
|\ \ \ \
| * | | | name-rev: allow to specify a subpath for --refs optionNamhyung Kim2013-06-181-7/+29
| | |_|/ | |/| |
* | | | Merge branch 'jk/submodule-subdirectory-ok'Junio C Hamano2013-06-301-5/+19
|\ \ \ \
| * | | | rev-parse: add --prefix optionJohn Keeping2013-06-171-5/+19
| |/ / /
* | | | Merge branch 'bc/checkout-tracking-name-plug-leak'Junio C Hamano2013-06-271-2/+5
|\ \ \ \
| * | | | builtin/checkout.c: don't leak memory in check_tracking_nameBrandon Casey2013-06-181-2/+5
* | | | | Merge branch 'tr/maint-apply-non-git-patch-parsefix'Junio C Hamano2013-06-261-1/+1
|\ \ \ \ \
| * | | | | apply: carefully strdup a possibly-NULL nameThomas Rast2013-06-211-1/+1
* | | | | | Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'Junio C Hamano2013-06-263-4/+2
|\ \ \ \ \ \
| * | | | | | fix "builtin-*" references to be "builtin/*"Phil Hord2013-06-183-4/+2
* | | | | | | Merge branch 'mm/rm-coalesce-errors'Junio C Hamano2013-06-241-19/+82
|\ \ \ \ \ \ \
| * | | | | | | rm: introduce advice.rmHints to shorten messagesMathieu Lienard--Mayor2013-06-121-1/+2
| * | | | | | | rm: better error message on failure for multiple filesMathieu Lienard--Mayor2013-06-121-19/+81
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jh/libify-note-handling'Junio C Hamano2013-06-242-133/+6
|\ \ \ \ \ \ \
| * | | | | | | Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.cJohan Herland2013-06-122-130/+2
| * | | | | | | finish_copy_notes_for_rewrite(): Let caller provide commit messageJohan Herland2013-06-122-5/+6
| |/ / / / / /
* | | | | | | Revert "Merge branch 'jg/status-config'"Junio C Hamano2013-06-241-11/+0
* | | | | | | Merge branch 'jg/status-config'Junio C Hamano2013-06-231-0/+11
|\ \ \ \ \ \ \
| * | | | | | | status: introduce status.branch to enable --branch by defaultJorge Juan Garcia Garcia2013-06-151-0/+4
| * | | | | | | status: introduce status.short to enable --short by defaultJorge Juan Garcia Garcia2013-06-111-0/+7
| |/ / / / / /
* | | | | | | Merge branch 'rs/logical-vs-binary-or'Junio C Hamano2013-06-203-6/+6
|\ \ \ \ \ \ \
| * | | | | | | use logical OR (||) instead of binary OR (|) in logical contextRené Scharfe2013-06-133-6/+6
| * | | | | | | Merge branch 'jn/config-ignore-inaccessible' into maintJunio C Hamano2013-06-091-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'mm/color-auto-default'Junio C Hamano2013-06-201-0/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | make color.ui default to 'auto'Matthieu Moy2013-06-101-1/+1
| * | | | | | | config: refactor management of color.ui's default valueMatthieu Moy2013-05-151-0/+5
* | | | | | | | Merge branch 'mh/reflife'Junio C Hamano2013-06-145-51/+57
|\ \ \ \ \ \ \ \
| * | | | | | | | exclude_existing(): set existing_refs.strdup_stringsMichael Haggerty2013-06-021-1/+1
| * | | | | | | | add_existing(): do not retain a reference to sha1Michael Haggerty2013-06-021-3/+4
| * | | | | | | | do_fetch(): clean up existing_refs before exitingMichael Haggerty2013-06-021-5/+9
| * | | | | | | | do_fetch(): reduce scope of peer_itemMichael Haggerty2013-06-021-3/+3
| * | | | | | | | fsck: don't put a void*-shaped peg in a char*-shaped holeMichael Haggerty2013-05-281-1/+1
| * | | | | | | | cmd_diff(): make it obvious which cases are exclusive of each otherMichael Haggerty2013-05-281-5/+4
| * | | | | | | | cmd_diff(): rename local variable "list" -> "entry"Michael Haggerty2013-05-281-4/+4
| * | | | | | | | cmd_diff(): use an object_array for holding treesMichael Haggerty2013-05-281-19/+18
| * | | | | | | | builtin_diff_tree(): make it obvious that function wants two entriesMichael Haggerty2013-05-281-9/+10