summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | Merge branch 'jk/merge-tree-added-identically'Junio C Hamano2013-05-061-1/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | merge-tree: handle directory/empty conflict correctlyJohn Keeping2013-05-061-1/+5
* | | | | | | | Merge branch 'tr/remote-tighten-commandline-parsing'Junio C Hamano2013-05-011-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | remote: check for superfluous arguments in 'git remote add'Thomas Rast2013-04-241-1/+1
* | | | | | | | | Merge branch 'jk/check-corrupt-objects-carefully'Junio C Hamano2013-04-281-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | clone: Make the 'junk_mode' symbol a file staticRamsay Jones2013-04-281-1/+1
* | | | | | | | | | Merge branch 'jk/merge-tree-added-identically'Junio C Hamano2013-04-281-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | merge-tree: fix typo in "both changed identically"John Keeping2013-04-281-1/+1
* | | | | | | | | | Merge branch 'rr/shortlog-doc'Junio C Hamano2013-04-262-4/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin/shortlog.c: make usage string consistent with logRamkumar Ramachandra2013-04-221-3/+1
| * | | | | | | | | | builtin/log.c: make usage string consistent with docRamkumar Ramachandra2013-04-221-1/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jc/add-ignore-removal'Junio C Hamano2013-04-261-6/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git add: rephrase -A/--no-all warningJunio C Hamano2013-04-221-6/+6
| * | | | | | | | | | git add: --ignore-removal is a better named --no-allJunio C Hamano2013-04-221-0/+11
* | | | | | | | | | | Merge branch 'jc/warn-pathless-add-finishing-touches'Junio C Hamano2013-04-261-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git add: avoid "-u/-A without pathspec" warning on stat-dirty pathsJunio C Hamano2013-04-261-0/+2
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/remote-helper-with-signed-tags'Junio C Hamano2013-04-241-1/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fast-export: add --signed-tags=warn-strip modeJohn Keeping2013-04-151-1/+7
* | | | | | | | | | | | Sync with maintJunio C Hamano2013-04-241-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \