Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/archive-attribute' | Junio C Hamano | 2009-04-18 | 9 | -12/+147 |
|\ | |||||
| * | archive test: attributes | René Scharfe | 2009-04-17 | 1 | -0/+91 |
| * | archive: do not read .gitattributes in working directory | Nguyễn Thái Ngọc Duy | 2009-04-17 | 4 | -2/+36 |
| * | unpack-trees: do not muck with attributes when we are not checking out | Junio C Hamano | 2009-04-17 | 1 | -2/+4 |
| * | attr: add GIT_ATTR_INDEX "direction" | Nguyễn Thái Ngọc Duy | 2009-04-17 | 2 | -4/+11 |
| * | archive tests: do not use .gitattributes in working directory | René Scharfe | 2009-04-17 | 1 | -4/+5 |
* | | Merge branch 'maint' | Junio C Hamano | 2009-04-18 | 5 | -11/+53 |
|\ \ | |||||
| * | | Describe fixes since 1.6.2.3 | Junio C Hamano | 2009-04-18 | 2 | -1/+32 |
| * | | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-04-18 | 0 | -0/+0 |
| |\ \ | |||||
| | * \ | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-04-18 | 3 | -9/+20 |
| | |\ \ | |||||
| * | \ \ | Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint | Junio C Hamano | 2009-04-18 | 4 | -5/+29 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'js/maint-submodule-checkout' into maint | Junio C Hamano | 2009-04-18 | 2 | -3/+42 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'cb/maint-merge-recursive-submodule-fix' into maint | Junio C Hamano | 2009-04-18 | 2 | -12/+78 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | doc/git-daemon: add missing arguments to max-connections option | Markus Heidelberg | 2009-04-18 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'maint-1.6.0' into maint | Junio C Hamano | 2009-04-18 | 3 | -9/+20 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | * | | | | | | doc/git-daemon: add missing arguments to options | Markus Heidelberg | 2009-04-18 | 1 | -8/+8 |
| | * | | | | | | init: Do not segfault on big GIT_TEMPLATE_DIR environment variable | Frank Lichtenheld | 2009-04-18 | 2 | -1/+12 |
| * | | | | | | | imap-send: use correct configuration variable in documentation | Paul Bolle | 2009-04-18 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'ac/color-graph' | Junio C Hamano | 2009-04-17 | 2 | -48/+199 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | graph API: Added logic for colored edges | Allan Caffee | 2009-04-13 | 2 | -48/+199 |
* | | | | | | | | | Merge branch 'jk/cobdoc' | Junio C Hamano | 2009-04-17 | 2 | -47/+45 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | docs/checkout: clarify what "non-branch" means | Jeff King | 2009-04-13 | 1 | -5/+5 |
| * | | | | | | | | | doc/checkout: split checkout and branch creation in synopsis | Jeff King | 2009-04-13 | 1 | -18/+22 |
| * | | | | | | | | | doc/checkout: refer to git-branch(1) as appropriate | Jeff King | 2009-04-13 | 1 | -19/+9 |
| * | | | | | | | | | doc: refer to tracking configuration as "upstream" | Jeff King | 2009-04-13 | 2 | -12/+14 |
| * | | | | | | | | | doc: clarify --no-track option | Jeff King | 2009-04-13 | 2 | -2/+4 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'mk/apply-swap' | Junio C Hamano | 2009-04-17 | 2 | -7/+84 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | builtin-apply: keep information about files to be deleted | Michał Kiedrowicz | 2009-04-15 | 2 | -8/+47 |
| * | | | | | | | | | tests: test applying criss-cross rename patch | Michał Kiedrowicz | 2009-04-13 | 1 | -0/+38 |
* | | | | | | | | | | Merge branch 'mm/add-p-quit' | Junio C Hamano | 2009-04-17 | 2 | -39/+38 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Update git-add.txt according to the new possibilities of 'git add -p'. | Matthieu Moy | 2009-04-16 | 1 | -1/+3 |
| * | | | | | | | | | | add-interactive: refactor mode hunk handling | Jeff King | 2009-04-16 | 1 | -43/+21 |
| * | | | | | | | | | | git add -p: new "quit" command at the prompt. | Matthieu Moy | 2009-04-15 | 2 | -1/+20 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'eb/upload-archive-from-git-shell' | Junio C Hamano | 2009-04-17 | 2 | -3/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | git-shell: Add 'git-upload-archive' to allowed commands. | Erik Broes | 2009-04-11 | 2 | -3/+4 |
* | | | | | | | | | | | Merge branch 'jc/shared-literally' | Junio C Hamano | 2009-04-17 | 1 | -5/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Mark t1301 permission test to depend on POSIXPERM | Junio C Hamano | 2009-04-12 | 346 | -4349/+10224 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | t1301-shared-repo: fix forced modes test | Johannes Sixt | 2009-04-12 | 1 | -4/+8 |
* | | | | | | | | | | | | Merge branch 'ns/am-to-empty' | Junio C Hamano | 2009-04-17 | 2 | -5/+39 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | git-am: teach git-am to apply a patch to an unborn branch | Nanako Shiraishi | 2009-04-12 | 2 | -5/+39 |
* | | | | | | | | | | | | | Merge branch 'bw/short-ref-strict' | Junio C Hamano | 2009-04-17 | 9 | -17/+67 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | remote.c: use shorten_unambiguous_ref | Michael J Gruber | 2009-04-17 | 1 | -5/+1 |
| * | | | | | | | | | | | | | rev-parse: --abbrev-ref option to shorten ref name | Bert Wesarg | 2009-04-13 | 2 | -2/+26 |
| * | | | | | | | | | | | | | for-each-ref: utilize core.warnAmbiguousRefs for :short-format | Bert Wesarg | 2009-04-13 | 3 | -4/+22 |
| * | | | | | | | | | | | | | shorten_unambiguous_ref(): add strict mode | Bert Wesarg | 2009-04-13 | 4 | -7/+19 |
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'da/difftool' | Junio C Hamano | 2009-04-17 | 15 | -486/+825 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | mergetool--lib: simplify API usage by removing more global variables | David Aguilar | 2009-04-12 | 4 | -70/+76 |
| * | | | | | | | | | | | | | Fix misspelled mergetool.keepBackup | Ferry Huberts | 2009-04-11 | 1 | -1/+1 |
| * | | | | | | | | | | | | | difftool/mergetool: refactor commands to use git-mergetool--lib | David Aguilar | 2009-04-08 | 6 | -388/+458 |
| * | | | | | | | | | | | | | mergetool: use $( ... ) instead of `backticks` | David Aguilar | 2009-04-07 | 1 | -8/+8 |