summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | fetch: make own copies of refnamesMichael Haggerty2013-05-281-2/+2
| * | | | describe: make own copy of refnameMichael Haggerty2013-05-281-2/+4
| | |/ / | |/| |
* | | | Merge branch 'rs/unpack-trees-plug-leak'Junio C Hamano2013-06-111-2/+3
|\ \ \ \
| * | | | diff-lib, read-tree, unpack-trees: mark cache_entry array paramters constRené Scharfe2013-06-021-1/+2
| * | | | diff-lib, read-tree, unpack-trees: mark cache_entry pointers constRené Scharfe2013-06-021-1/+1
| |/ / /
* | | | Merge branch 'rr/push-head'Junio C Hamano2013-06-061-7/+14
|\ \ \ \
| * | | | push: make push.default = current use resolved HEADRamkumar Ramachandra2013-05-291-1/+1
| * | | | push: fail early with detached HEAD and currentRamkumar Ramachandra2013-05-291-0/+5
| * | | | push: factor out the detached HEAD error messageRamkumar Ramachandra2013-05-291-6/+8
| |/ / /
* | | | Merge branch 'nd/clone-connectivity-shortcut'Junio C Hamano2013-06-062-14/+39
|\ \ \ \
| * | | | clone: open a shortcut for connectivity checkNguyễn Thái Ngọc Duy2013-05-282-12/+34
| * | | | index-pack: remove dead code (it should never happen)Nguyễn Thái Ngọc Duy2013-05-281-2/+1
| * | | | clone: let the user know when check_everything_connected is runNguyễn Thái Ngọc Duy2013-05-111-0/+4
| |/ / /
* | | | Merge branch 'nd/prune-packed-dryrun-verbose'Junio C Hamano2013-06-062-9/+8
|\ \ \ \
| * | | | prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects()Nguyễn Thái Ngọc Duy2013-05-282-9/+8
| |/ / /
* | | | Merge branch 'rs/commit-m-no-edit'Junio C Hamano2013-06-051-4/+6
|\ \ \ \
| * | | | commit: don't start editor if empty message is given with -mRené Scharfe2013-05-281-4/+6
| | |/ / | |/| |
| * | | Merge branch 'tr/remote-tighten-commandline-parsing' into maintJunio C Hamano2013-05-031-1/+1
| |\ \ \
| * \ \ \ Merge branch 'jk/receive-pack-deadlocks-with-early-failure' into maintJunio C Hamano2013-04-261-1/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/chopped-ident' into maintJunio C Hamano2013-04-262-74/+8
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rt/commentchar-fmt-merge-msg' into maintJunio C Hamano2013-04-261-7/+11
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'tr/line-log'Junio C Hamano2013-06-022-91/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | log -L: :pattern:file syntax to find by funcnameThomas Rast2013-03-281-1/+1
| * | | | | | | | Implement line-history search (git log -L)Thomas Rast2013-03-281-0/+31
View Lorry Controller Status