Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jg/status-config' | Junio C Hamano | 2013-07-11 | 1 | -19/+64 |
|\ | |||||
| * | status/commit: make sure --porcelain is not affected by user-facing config | Junio C Hamano | 2013-06-24 | 1 | -22/+55 |
| * | commit: make it work with status.short | Ramkumar Ramachandra | 2013-06-24 | 1 | -0/+1 |
| * | status: introduce status.branch to enable --branch by default | Jorge Juan Garcia Garcia | 2013-06-24 | 1 | -0/+4 |
| * | status: introduce status.short to enable --short by default | Jorge Juan Garcia Garcia | 2013-06-24 | 1 | -0/+7 |
* | | Merge branch 'rr/rebase-checkout-reflog' | Junio C Hamano | 2013-07-11 | 1 | -3/+8 |
|\ \ | |||||
| * | | checkout: respect GIT_REFLOG_ACTION | Ramkumar Ramachandra | 2013-06-17 | 1 | -3/+8 |
| |/ | |||||
* | | Merge branch 'jc/triangle-push-fixup' | Junio C Hamano | 2013-07-11 | 1 | -12/+31 |
|\ \ | |||||
| * | | push: change `simple` to accommodate triangular workflows | Ramkumar Ramachandra | 2013-06-24 | 1 | -12/+31 |
* | | | Merge branch 'jc/topo-author-date-sort' | Junio C Hamano | 2013-07-01 | 2 | -7/+9 |
|\ \ \ | |||||
| * | | | toposort: rename "lifo" field | Junio C Hamano | 2013-06-11 | 2 | -7/+9 |
* | | | | Merge branch 'mh/ref-races' | Junio C Hamano | 2013-06-30 | 2 | -6/+11 |
|\ \ \ \ | |||||
| * | | | | Extract a struct stat_data from cache_entry | Michael Haggerty | 2013-06-20 | 1 | -5/+7 |
| * | | | | refs: implement simple transactions for the packed-refs file | Michael Haggerty | 2013-06-20 | 1 | -1/+4 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'nk/name-rev-abbreviated-refs' | Junio C Hamano | 2013-06-30 | 1 | -7/+29 |
|\ \ \ \ | |||||
| * | | | | name-rev: allow to specify a subpath for --refs option | Namhyung Kim | 2013-06-18 | 1 | -7/+29 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'jk/submodule-subdirectory-ok' | Junio C Hamano | 2013-06-30 | 1 | -5/+19 |
|\ \ \ \ | |||||
| * | | | | rev-parse: add --prefix option | John Keeping | 2013-06-17 | 1 | -5/+19 |
| |/ / / | |||||
* | | | | Merge branch 'bc/checkout-tracking-name-plug-leak' | Junio C Hamano | 2013-06-27 | 1 | -2/+5 |
|\ \ \ \ | |||||
| * | | | | builtin/checkout.c: don't leak memory in check_tracking_name | Brandon Casey | 2013-06-18 | 1 | -2/+5 |
* | | | | | Merge branch 'tr/maint-apply-non-git-patch-parsefix' | Junio C Hamano | 2013-06-26 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | apply: carefully strdup a possibly-NULL name | Thomas Rast | 2013-06-21 | 1 | -1/+1 |
* | | | | | | Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' | Junio C Hamano | 2013-06-26 | 3 | -4/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix "builtin-*" references to be "builtin/*" | Phil Hord | 2013-06-18 | 3 | -4/+2 |
* | | | | | | | Merge branch 'mm/rm-coalesce-errors' | Junio C Hamano | 2013-06-24 | 1 | -19/+82 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rm: introduce advice.rmHints to shorten messages | Mathieu Lienard--Mayor | 2013-06-12 | 1 | -1/+2 |
| * | | | | | | | rm: better error message on failure for multiple files | Mathieu Lienard--Mayor | 2013-06-12 | 1 | -19/+81 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jh/libify-note-handling' | Junio C Hamano | 2013-06-24 | 2 | -133/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c | Johan Herland | 2013-06-12 | 2 | -130/+2 |
| * | | | | | | | finish_copy_notes_for_rewrite(): Let caller provide commit message | Johan Herland | 2013-06-12 | 2 | -5/+6 |
| |/ / / / / / | |||||
* | | | | | | | 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 |