aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'nd/clone-local-with-colon'Junio C Hamano2013-06-02
|\
| * clone: allow cloning local paths with colons in themNguyễn Thái Ngọc Duy2013-05-07
* | Merge branch 'fc/fast-export-persistent-marks'Junio C Hamano2013-06-02
|\ \
| * | fast-{import,export}: use get_sha1_hex() to read from marks fileFelipe Contreras2013-05-07
| * | fast-export: don't parse commits while reading marks fileFelipe Contreras2013-05-07
| * | fast-export: do not parse non-commit objects while reading marks fileFelipe Contreras2013-05-07
* | | Merge branch 'jn/config-ignore-inaccessible'Junio C Hamano2013-05-29
|\ \ \
| * | | config: allow inaccessible configuration under $HOMEJonathan Nieder2013-04-15
* | | | Merge branch 'mh/packed-refs-various'Junio C Hamano2013-05-29
|\ \ \ \
| * | | | pack-refs: merge code from pack-refs.{c,h} into refs.{c,h}Michael Haggerty2013-05-01
* | | | | Merge branch 'as/check-ignore'Junio C Hamano2013-05-29
|\ \ \ \ \
| * | | | | check-ignore: allow incremental streaming of queries via --stdinAdam Spiers2013-04-11
| * | | | | check-ignore: move setup into cmd_check_ignore()Adam Spiers2013-04-11
| * | | | | check-ignore: add -n / --non-matching optionAdam Spiers2013-04-11
* | | | | | Merge branch 'jh/checkout-auto-tracking'Junio C Hamano2013-05-29
|\ \ \ \ \ \
| * | | | | | checkout: Use remote refspecs when DWIMming tracking branchesJohan Herland2013-04-21
* | | | | | | Merge branch 'jc/prune-all'Junio C Hamano2013-05-29
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | prune: introduce OPT_EXPIRY_DATE() and use itJunio C Hamano2013-04-25
| * | | | | | date.c: add parse_expiry_date()Junio C Hamano2013-04-17
* | | | | | | Merge branch 'jk/merge-tree-added-identically'Junio C Hamano2013-05-06
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | merge-tree: handle directory/empty conflict correctlyJohn Keeping2013-05-06
* | | | | | | Merge branch 'tr/remote-tighten-commandline-parsing'Junio C Hamano2013-05-01
|\ \ \ \ \ \ \
| * | | | | | | remote: check for superfluous arguments in 'git remote add'Thomas Rast2013-04-24
* | | | | | | | Merge branch 'jk/check-corrupt-objects-carefully'Junio C Hamano2013-04-28
|\ \ \ \ \ \ \ \
| * | | | | | | | clone: Make the 'junk_mode' symbol a file staticRamsay Jones2013-04-28
* | | | | | | | | Merge branch 'jk/merge-tree-added-identically'Junio C Hamano2013-04-28
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | merge-tree: fix typo in "both changed identically"John Keeping2013-04-28
* | | | | | | | | Merge branch 'rr/shortlog-doc'Junio C Hamano2013-04-26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | builtin/shortlog.c: make usage string consistent with logRamkumar Ramachandra2013-04-22
| * | | | | | | | | builtin/log.c: make usage string consistent with docRamkumar Ramachandra2013-04-22
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/add-ignore-removal'Junio C Hamano2013-04-26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git add: rephrase -A/--no-all warningJunio C Hamano2013-04-22
| * | | | | | | | | git add: --ignore-removal is a better named --no-allJunio C Hamano2013-04-22
* | | | | | | | | | Merge branch 'jc/warn-pathless-add-finishing-touches'Junio C Hamano2013-04-26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git add: avoid "-u/-A without pathspec" warning on stat-dirty pathsJunio C Hamano2013-04-26
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/remote-helper-with-signed-tags'Junio C Hamano2013-04-24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fast-export: add --signed-tags=warn-strip modeJohn Keeping2013-04-15
* | | | | | | | | | | Sync with maintJunio C Hamano2013-04-24
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/merge-tag-object' into maintJunio C Hamano2013-04-24
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | cherry-pick/revert: make usage say '<commit-ish>...'Kevin Bracey2013-04-24
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'jk/show-branch-strbuf' into maintJunio C Hamano2013-04-22
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/apply-ws-fix-tab-in-indent' into maintJunio C Hamano2013-04-22
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'nd/pretty-formats'Junio C Hamano2013-04-23
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | pretty: save commit encoding from logmsg_reencode if the caller needs itNguyễn Thái Ngọc Duy2013-04-18
* | | | | | | | | | | | | | Merge branch 'kb/status-ignored-optim-2'Junio C Hamano2013-04-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | dir.c: git-status --ignored: don't scan the work tree twiceKarsten Blees2013-04-15
| * | | | | | | | | | | | | | dir.c: replace is_path_excluded with now equivalent is_excluded APIKarsten Blees2013-04-15
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jk/receive-pack-deadlocks-with-early-failure'Junio C Hamano2013-04-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | receive-pack: close sideband fd on early pack errorsJeff King2013-04-19
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'as/clone-reference-with-gitfile'Junio C Hamano2013-04-22
|\ \ \ \ \ \ \ \ \ \ \ \ \