Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Merge branch 'jg/status-config'" | Junio C Hamano | 2013-06-24 | 1 | -11/+0 |
* | Merge branch 'jg/status-config' | Junio C Hamano | 2013-06-23 | 1 | -0/+11 |
|\ | |||||
| * | status: introduce status.branch to enable --branch by default | Jorge Juan Garcia Garcia | 2013-06-15 | 1 | -0/+4 |
| * | status: introduce status.short to enable --short by default | Jorge Juan Garcia Garcia | 2013-06-11 | 1 | -0/+7 |
* | | Merge branch 'rs/logical-vs-binary-or' | Junio C Hamano | 2013-06-20 | 3 | -6/+6 |
|\ \ | |||||
| * | | use logical OR (||) instead of binary OR (|) in logical context | René Scharfe | 2013-06-13 | 3 | -6/+6 |
| * | | Merge branch 'jn/config-ignore-inaccessible' into maint | Junio C Hamano | 2013-06-09 | 1 | -2/+2 |
| |\ \ | | |/ | |/| | |||||
* | | | Merge branch 'mm/color-auto-default' | Junio C Hamano | 2013-06-20 | 1 | -0/+5 |
|\ \ \ | |||||
| * | | | make color.ui default to 'auto' | Matthieu Moy | 2013-06-10 | 1 | -1/+1 |
| * | | | config: refactor management of color.ui's default value | Matthieu Moy | 2013-05-15 | 1 | -0/+5 |
* | | | | Merge branch 'mh/reflife' | Junio C Hamano | 2013-06-14 | 5 | -51/+57 |
|\ \ \ \ | |||||
| * | | | | exclude_existing(): set existing_refs.strdup_strings | Michael Haggerty | 2013-06-02 | 1 | -1/+1 |
| * | | | | add_existing(): do not retain a reference to sha1 | Michael Haggerty | 2013-06-02 | 1 | -3/+4 |
| * | | | | do_fetch(): clean up existing_refs before exiting | Michael Haggerty | 2013-06-02 | 1 | -5/+9 |
| * | | | | do_fetch(): reduce scope of peer_item | Michael Haggerty | 2013-06-02 | 1 | -3/+3 |
| * | | | | fsck: don't put a void*-shaped peg in a char*-shaped hole | Michael Haggerty | 2013-05-28 | 1 | -1/+1 |
| * | | | | cmd_diff(): make it obvious which cases are exclusive of each other | Michael Haggerty | 2013-05-28 | 1 | -5/+4 |
| * | | | | cmd_diff(): rename local variable "list" -> "entry" | Michael Haggerty | 2013-05-28 | 1 | -4/+4 |
| * | | | | cmd_diff(): use an object_array for holding trees | Michael Haggerty | 2013-05-28 | 1 | -19/+18 |
| * | | | | builtin_diff_tree(): make it obvious that function wants two entries | Michael Haggerty | 2013-05-28 | 1 | -9/+10 |
| * | | | | fetch: make own copies of refnames | Michael Haggerty | 2013-05-28 | 1 | -2/+2 |
| * | | | | describe: make own copy of refname | Michael Haggerty | 2013-05-28 | 1 | -2/+4 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'rs/unpack-trees-plug-leak' | Junio C Hamano | 2013-06-11 | 1 | -2/+3 |
|\ \ \ \ | |||||
| * | | | | diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const | René Scharfe | 2013-06-02 | 1 | -1/+2 |
| * | | | | diff-lib, read-tree, unpack-trees: mark cache_entry pointers const | René Scharfe | 2013-06-02 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'rr/push-head' | Junio C Hamano | 2013-06-06 | 1 | -7/+14 |
|\ \ \ \ | |||||
| * | | | | push: make push.default = current use resolved HEAD | Ramkumar Ramachandra | 2013-05-29 | 1 | -1/+1 |
| * | | | | push: fail early with detached HEAD and current | Ramkumar Ramachandra | 2013-05-29 | 1 | -0/+5 |
| * | | | | push: factor out the detached HEAD error message | Ramkumar Ramachandra | 2013-05-29 | 1 | -6/+8 |
| |/ / / | |||||
* | | | | Merge branch 'nd/clone-connectivity-shortcut' | Junio C Hamano | 2013-06-06 | 2 | -14/+39 |
|\ \ \ \ | |||||
| * | | | | clone: open a shortcut for connectivity check | Nguyễn Thái Ngọc Duy | 2013-05-28 | 2 | -12/+34 |
| * | | | | index-pack: remove dead code (it should never happen) | Nguyễn Thái Ngọc Duy | 2013-05-28 | 1 | -2/+1 |
| * | | | | clone: let the user know when check_everything_connected is run | Nguyễn Thái Ngọc Duy | 2013-05-11 | 1 | -0/+4 |
| |/ / / | |||||
* | | | | Merge branch 'nd/prune-packed-dryrun-verbose' | Junio C Hamano | 2013-06-06 | 2 | -9/+8 |
|\ \ \ \ | |||||
| * | | | | prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects() | Nguyễn Thái Ngọc Duy | 2013-05-28 | 2 | -9/+8 |
| |/ / / | |||||
* | | | | Merge branch 'rs/commit-m-no-edit' | Junio C Hamano | 2013-06-05 | 1 | -4/+6 |
|\ \ \ \ | |||||
| * | | | | commit: don't start editor if empty message is given with -m | René Scharfe | 2013-05-28 | 1 | -4/+6 |
| | |/ / | |/| | | |||||
| * | | | Merge branch 'tr/remote-tighten-commandline-parsing' into maint | Junio C Hamano | 2013-05-03 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jk/receive-pack-deadlocks-with-early-failure' into maint | Junio C Hamano | 2013-04-26 | 1 | -1/+4 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/chopped-ident' into maint | Junio C Hamano | 2013-04-26 | 2 | -74/+8 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'rt/commentchar-fmt-merge-msg' into maint | Junio C Hamano | 2013-04-26 | 1 | -7/+11 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'tr/line-log' | Junio C Hamano | 2013-06-02 | 2 | -91/+39 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | log -L: :pattern:file syntax to find by funcname | Thomas Rast | 2013-03-28 | 1 | -1/+1 |
| * | | | | | | | | Implement line-history search (git log -L) | Thomas Rast | 2013-03-28 | 1 | -0/+31 |
| * | | | | | | | | Refactor parse_loc | Bo Yang | 2013-03-28 | 1 | -91/+8 |
* | | | | | | | | | Merge branch 'mc/describe-first-parent' | Junio C Hamano | 2013-06-02 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | describe: Add --first-parent option | Mike Crowe | 2013-05-20 | 1 | -0/+5 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jk/fetch-always-update-tracking' | Junio C Hamano | 2013-06-02 | 1 | -22/+51 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fetch: don't try to update unfetched tracking refs | John Keeping | 2013-05-28 | 1 | -1/+1 |
| * | | | | | | | | | fetch: opportunistically update tracking refs | Jeff King | 2013-05-12 | 1 | -0/+16 |