aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jg/status-config'Junio C Hamano2013-06-23
|\
| * status: introduce status.branch to enable --branch by defaultJorge Juan Garcia Garcia2013-06-15
| * status: introduce status.short to enable --short by defaultJorge Juan Garcia Garcia2013-06-11
* | Merge branch 'rs/logical-vs-binary-or'Junio C Hamano2013-06-20
|\ \
| * | use logical OR (||) instead of binary OR (|) in logical contextRené Scharfe2013-06-13
| * | Merge branch 'jn/config-ignore-inaccessible' into maintJunio C Hamano2013-06-09
| |\ \ | | |/ | |/|
* | | Merge branch 'mm/color-auto-default'Junio C Hamano2013-06-20
|\ \ \
| * | | make color.ui default to 'auto'Matthieu Moy2013-06-10
| * | | config: refactor management of color.ui's default valueMatthieu Moy2013-05-15
* | | | Merge branch 'mh/reflife'Junio C Hamano2013-06-14
|\ \ \ \
| * | | | exclude_existing(): set existing_refs.strdup_stringsMichael Haggerty2013-06-02
| * | | | add_existing(): do not retain a reference to sha1Michael Haggerty2013-06-02
| * | | | do_fetch(): clean up existing_refs before exitingMichael Haggerty2013-06-02
| * | | | do_fetch(): reduce scope of peer_itemMichael Haggerty2013-06-02
| * | | | fsck: don't put a void*-shaped peg in a char*-shaped holeMichael Haggerty2013-05-28
| * | | | cmd_diff(): make it obvious which cases are exclusive of each otherMichael Haggerty2013-05-28
| * | | | cmd_diff(): rename local variable "list" -> "entry"Michael Haggerty2013-05-28
| * | | | cmd_diff(): use an object_array for holding treesMichael Haggerty2013-05-28
| * | | | builtin_diff_tree(): make it obvious that function wants two entriesMichael Haggerty2013-05-28
| * | | | fetch: make own copies of refnamesMichael Haggerty2013-05-28
| * | | | describe: make own copy of refnameMichael Haggerty2013-05-28
| | |/ / | |/| |
* | | | Merge branch 'rs/unpack-trees-plug-leak'Junio C Hamano2013-06-11
|\ \ \ \
| * | | | diff-lib, read-tree, unpack-trees: mark cache_entry array paramters constRené Scharfe2013-06-02
| * | | | diff-lib, read-tree, unpack-trees: mark cache_entry pointers constRené Scharfe2013-06-02
| |/ / /
* | | | Merge branch 'rr/push-head'Junio C Hamano2013-06-06
|\ \ \ \
| * | | | push: make push.default = current use resolved HEADRamkumar Ramachandra2013-05-29
| * | | | push: fail early with detached HEAD and currentRamkumar Ramachandra2013-05-29
| * | | | push: factor out the detached HEAD error messageRamkumar Ramachandra2013-05-29
| |/ / /
* | | | Merge branch 'nd/clone-connectivity-shortcut'Junio C Hamano2013-06-06
|\ \ \ \
| * | | | clone: open a shortcut for connectivity checkNguyễn Thái Ngọc Duy2013-05-28
| * | | | index-pack: remove dead code (it should never happen)Nguyễn Thái Ngọc Duy2013-05-28
| * | | | clone: let the user know when check_everything_connected is runNguyễn Thái Ngọc Duy2013-05-11
| |/ / /
* | | | Merge branch 'nd/prune-packed-dryrun-verbose'Junio C Hamano2013-06-06
|\ \ \ \
| * | | | prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects()Nguyễn Thái Ngọc Duy2013-05-28
| |/ / /
* | | | Merge branch 'rs/commit-m-no-edit'Junio C Hamano2013-06-05
|\ \ \ \
| * | | | commit: don't start editor if empty message is given with -mRené Scharfe2013-05-28
| | |/ / | |/| |
| * | | Merge branch 'tr/remote-tighten-commandline-parsing' into maintJunio C Hamano2013-05-03
| |\ \ \
| * \ \ \ Merge branch 'jk/receive-pack-deadlocks-with-early-failure' into maintJunio C Hamano2013-04-26
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/chopped-ident' into maintJunio C Hamano2013-04-26
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rt/commentchar-fmt-merge-msg' into maintJunio C Hamano2013-04-26
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'tr/line-log'Junio C Hamano2013-06-02
|\ \ \ \ \ \ \ \
| * | | | | | | | log -L: :pattern:file syntax to find by funcnameThomas Rast2013-03-28
| * | | | | | | | Implement line-history search (git log -L)Thomas Rast2013-03-28
| * | | | | | | | Refactor parse_locBo Yang2013-03-28
* | | | | | | | | Merge branch 'mc/describe-first-parent'Junio C Hamano2013-06-02
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | describe: Add --first-parent optionMike Crowe2013-05-20
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/fetch-always-update-tracking'Junio C Hamano2013-06-02
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fetch: don't try to update unfetched tracking refsJohn Keeping2013-05-28
| * | | | | | | | | fetch: opportunistically update tracking refsJeff King2013-05-12
| * | | | | | | | | refactor "ref->merge" flagJeff King2013-05-12
| |/ / / / / / / /