Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'vv/help-unknown-ref' | Junio C Hamano | 2013-06-03 | 1 | -1/+2 |
|\ | |||||
| * | merge: use help_unknown_ref() | Vikrant Varma | 2013-05-09 | 1 | -1/+2 |
* | | Merge branch 'nd/clone-local-with-colon' | Junio C Hamano | 2013-06-03 | 1 | -0/+2 |
|\ \ | |||||
| * | | clone: allow cloning local paths with colons in them | Nguyễn Thái Ngọc Duy | 2013-05-07 | 1 | -0/+2 |
* | | | Merge branch 'fc/fast-export-persistent-marks' | Junio C Hamano | 2013-06-03 | 1 | -7/+15 |
|\ \ \ | |||||
| * | | | fast-{import,export}: use get_sha1_hex() to read from marks file | Felipe Contreras | 2013-05-08 | 1 | -1/+1 |
| * | | | fast-export: don't parse commits while reading marks file | Felipe Contreras | 2013-05-07 | 1 | -1/+6 |
| * | | | fast-export: do not parse non-commit objects while reading marks file | Felipe Contreras | 2013-05-07 | 1 | -6/+9 |
* | | | | Merge branch 'jn/config-ignore-inaccessible' | Junio C Hamano | 2013-05-29 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | config: allow inaccessible configuration under $HOME | Jonathan Nieder | 2013-04-15 | 1 | -2/+2 |
* | | | | | Merge branch 'mh/packed-refs-various' | Junio C Hamano | 2013-05-29 | 2 | -2/+1 |
|\ \ \ \ \ | |||||
| * | | | | | pack-refs: merge code from pack-refs.{c,h} into refs.{c,h} | Michael Haggerty | 2013-05-02 | 2 | -2/+1 |
* | | | | | | Merge branch 'as/check-ignore' | Junio C Hamano | 2013-05-29 | 1 | -42/+50 |
|\ \ \ \ \ \ | |||||
| * | | | | | | check-ignore: allow incremental streaming of queries via --stdin | Adam Spiers | 2013-04-11 | 1 | -10/+5 |
| * | | | | | | check-ignore: move setup into cmd_check_ignore() | Adam Spiers | 2013-04-11 | 1 | -20/+21 |
| * | | | | | | check-ignore: add -n / --non-matching option | Adam Spiers | 2013-04-11 | 1 | -17/+29 |
* | | | | | | | Merge branch 'jh/checkout-auto-tracking' | Junio C Hamano | 2013-05-29 | 1 | -20/+22 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | checkout: Use remote refspecs when DWIMming tracking branches | Johan Herland | 2013-04-22 | 1 | -20/+22 |
* | | | | | | | | Merge branch 'jc/prune-all' | Junio C Hamano | 2013-05-29 | 2 | -9/+9 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | prune: introduce OPT_EXPIRY_DATE() and use it | Junio C Hamano | 2013-04-25 | 1 | -2/+2 |
| * | | | | | | date.c: add parse_expiry_date() | Junio C Hamano | 2013-04-18 | 1 | -7/+7 |
* | | | | | | | Merge branch 'jk/merge-tree-added-identically' | Junio C Hamano | 2013-05-07 | 1 | -1/+5 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | merge-tree: handle directory/empty conflict correctly | John Keeping | 2013-05-07 | 1 | -1/+5 |
* | | | | | | | Merge branch 'tr/remote-tighten-commandline-parsing' | Junio C Hamano | 2013-05-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | remote: check for superfluous arguments in 'git remote add' | Thomas Rast | 2013-04-24 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'jk/check-corrupt-objects-carefully' | Junio C Hamano | 2013-04-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | clone: Make the 'junk_mode' symbol a file static | Ramsay Jones | 2013-04-28 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'jk/merge-tree-added-identically' | Junio C Hamano | 2013-04-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | merge-tree: fix typo in "both changed identically" | John Keeping | 2013-04-28 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'rr/shortlog-doc' | Junio C Hamano | 2013-04-27 | 2 | -4/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | builtin/shortlog.c: make usage string consistent with log | Ramkumar Ramachandra | 2013-04-22 | 1 | -3/+1 |
| * | | | | | | | | | builtin/log.c: make usage string consistent with doc | Ramkumar Ramachandra | 2013-04-22 | 1 | -1/+1 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jc/add-ignore-removal' | Junio C Hamano | 2013-04-27 | 1 | -6/+17 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git add: rephrase -A/--no-all warning | Junio C Hamano | 2013-04-22 | 1 | -6/+6 |
| * | | | | | | | | | git add: --ignore-removal is a better named --no-all | Junio C Hamano | 2013-04-22 | 1 | -0/+11 |
* | | | | | | | | | | Merge branch 'jc/warn-pathless-add-finishing-touches' | Junio C Hamano | 2013-04-27 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | git add: avoid "-u/-A without pathspec" warning on stat-dirty paths | Junio C Hamano | 2013-04-26 | 1 | -0/+2 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jk/remote-helper-with-signed-tags' | Junio C Hamano | 2013-04-25 | 1 | -1/+7 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fast-export: add --signed-tags=warn-strip mode | John Keeping | 2013-04-15 | 1 | -1/+7 |
* | | | | | | | | | | | Sync with maint | Junio C Hamano | 2013-04-25 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/merge-tag-object' into maint | Junio C Hamano | 2013-04-25 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | cherry-pick/revert: make usage say '<commit-ish>...' | Kevin Bracey | 2013-04-24 | 1 | -2/+2 |
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'jk/show-branch-strbuf' into maint | Junio C Hamano | 2013-04-22 | 1 | -9/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/apply-ws-fix-tab-in-indent' into maint | Junio C Hamano | 2013-04-22 | 1 | -6/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'nd/pretty-formats' | Junio C Hamano | 2013-04-23 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | pretty: save commit encoding from logmsg_reencode if the caller needs it | Nguyễn Thái Ngọc Duy | 2013-04-19 | 2 | -2/+2 |
* | | | | | | | | | | | | | | Merge branch 'kb/status-ignored-optim-2' | Junio C Hamano | 2013-04-23 | 3 | -21/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | dir.c: git-status --ignored: don't scan the work tree twice | Karsten Blees | 2013-04-15 | 1 | -1/+0 |
| * | | | | | | | | | | | | | | dir.c: replace is_path_excluded with now equivalent is_excluded API | Karsten Blees | 2013-04-15 | 3 | -20/+6 |
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'jk/receive-pack-deadlocks-with-early-failure' | Junio C Hamano | 2013-04-23 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | |