summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | | Refactor parse_locBo Yang2013-03-281-91/+8
* | | | | | | | Merge branch 'mc/describe-first-parent'Junio C Hamano2013-06-021-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | describe: Add --first-parent optionMike Crowe2013-05-201-0/+5
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'jk/fetch-always-update-tracking'Junio C Hamano2013-06-021-22/+51
|\ \ \ \ \ \ \ \
| * | | | | | | | fetch: don't try to update unfetched tracking refsJohn Keeping2013-05-281-1/+1
| * | | | | | | | fetch: opportunistically update tracking refsJeff King2013-05-121-0/+16
| * | | | | | | | refactor "ref->merge" flagJeff King2013-05-121-22/+35
| |/ / / / / / /
* | | | | | | | Merge branch 'vv/help-unknown-ref'Junio C Hamano2013-06-021-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | merge: use help_unknown_ref()Vikrant Varma2013-05-081-1/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'nd/clone-local-with-colon'Junio C Hamano2013-06-021-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | clone: allow cloning local paths with colons in themNguyễn Thái Ngọc Duy2013-05-071-0/+2
* | | | | | | | | Merge branch 'fc/fast-export-persistent-marks'Junio C Hamano2013-06-021-7/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fast-{import,export}: use get_sha1_hex() to read from marks fileFelipe Contreras2013-05-071-1/+1
| * | | | | | | | | fast-export: don't parse commits while reading marks fileFelipe Contreras2013-05-071-1/+6
| * | | | | | | | | fast-export: do not parse non-commit objects while reading marks fileFelipe Contreras2013-05-071-6/+9
* | | | | | | | | | Merge branch 'jn/config-ignore-inaccessible'Junio C Hamano2013-05-291-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | config: allow inaccessible configuration under $HOMEJonathan Nieder2013-04-151-2/+2
* | | | | | | | | | | Merge branch 'mh/packed-refs-various'Junio C Hamano2013-05-292-2/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pack-refs: merge code from pack-refs.{c,h} into refs.{c,h}Michael Haggerty2013-05-012-2/+1
* | | | | | | | | | | | Merge branch 'as/check-ignore'Junio C Hamano2013-05-291-42/+50
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | check-ignore: allow incremental streaming of queries via --stdinAdam Spiers2013-04-111-10/+5
| * | | | | | | | | | | | check-ignore: move setup into cmd_check_ignore()Adam Spiers2013-04-111-20/+21
| * | | | | | | | | | | | check-ignore: add -n / --non-matching optionAdam Spiers2013-04-111-17/+29
* | | | | | | | | | | | | Merge branch 'jh/checkout-auto-tracking'Junio C Hamano2013-05-291-20/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | checkout: Use remote refspecs when DWIMming tracking branchesJohan Herland2013-04-211-20/+22
* | | | | | | | | | | | | | Merge branch 'jc/prune-all'Junio C Hamano2013-05-292-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | / / / / / / / | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | prune: introduce OPT_EXPIRY_DATE() and use itJunio C Hamano2013-04-251-2/+2
| * | | | | | | | | | | | date.c: add parse_expiry_date()Junio C Hamano2013-04-171-7/+7
View Lorry Controller Status