summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* parse_pathspec: add special flag for max_depth featureNguyễn Thái Ngọc Duy2013-07-151-1/+2
* convert some get_pathspec() calls to parse_pathspec()Nguyễn Thái Ngọc Duy2013-07-153-6/+15
* pathspec: add copy_pathspecNguyễn Thái Ngọc Duy2013-07-151-6/+7
* move struct pathspec and related functions to pathspec.[ch]Nguyễn Thái Ngọc Duy2013-07-154-0/+4
* clean: remove unused variable "seen"Nguyễn Thái Ngọc Duy2013-07-151-9/+2
* Merge branch 'ms/remote-tracking-branches-in-doc'Junio C Hamano2013-07-122-3/+3
|\
| * Change "remote tracking" to "remote-tracking"ms/remote-tracking-branches-in-docMichael Schubert2013-07-032-3/+3
| * Merge branch 'nd/clone-connectivity-shortcut' (early part) into maintJunio C Hamano2013-06-281-0/+4
| |\
| * \ Merge branch 'rr/push-head' into maintJunio C Hamano2013-06-271-7/+14
| |\ \
| * \ \ Merge branch 'rs/commit-m-no-edit' into maintJunio C Hamano2013-06-271-4/+6
| |\ \ \
| * \ \ \ Merge branch 'jh/checkout-auto-tracking' into maintJunio C Hamano2013-06-271-20/+22
| |\ \ \ \
* | \ \ \ \ Merge branch 'jk/pull-to-integrate'Junio C Hamano2013-07-121-6/+6
|\ \ \ \ \ \
| * | | | | | push: avoid suggesting "merging" remote changesJohn Keeping2013-07-071-6/+6
* | | | | | | Merge branch 'as/log-output-encoding-in-user-format'Junio C Hamano2013-07-123-1/+6
|\ \ \ \ \ \ \
| * | | | | | | pretty: --format output should honor logOutputEncodingAlexey Shumkin2013-06-263-1/+6
| | |/ / / / / | |/| | | | |
* | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status