Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | t5516: refactor oddball tests | Jeff King | 2008-11-09 | 1 | -29/+21 |
* | Merge branch 'maint' | Junio C Hamano | 2008-11-08 | 2 | -0/+38 |
|\ | |||||
| * | Merge branch 'cb/maint-update-ref-fix' into maint | Junio C Hamano | 2008-11-08 | 2 | -0/+38 |
| |\ | |||||
| | * | push: fix local refs update if already up-to-date | Clemens Buchacher | 2008-11-05 | 1 | -0/+31 |
| | * | do not force write of packed refs | Clemens Buchacher | 2008-11-05 | 1 | -0/+7 |
| * | | Merge branch 'mv/maint-branch-m-symref' into maint | Junio C Hamano | 2008-11-08 | 2 | -0/+27 |
| |\ \ | | |/ | |/| | |||||
| * | | Merge branch 'js/maint-fetch-update-head' into maint | Junio C Hamano | 2008-11-02 | 5 | -3/+27 |
| |\ \ | |||||
| * \ \ | Merge branch 'jk/maint-ls-files-other' into maint | Junio C Hamano | 2008-11-02 | 1 | -0/+6 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jc/maint-reset-remove-unmerged-new' into maint | Junio C Hamano | 2008-11-02 | 1 | -0/+60 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jc/maint-co-track' into maint | Junio C Hamano | 2008-11-02 | 1 | -6/+20 |
| |\ \ \ \ \ | |||||
* | | | | | | | t5400: expect success for denying deletion | Jeff King | 2008-11-08 | 1 | -1/+1 |
* | | | | | | | Merge branch 'mv/maint-branch-m-symref' | Junio C Hamano | 2008-11-05 | 2 | -0/+27 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | update-ref --no-deref -d: handle the case when the pointed ref is packed | Miklos Vajna | 2008-10-31 | 1 | -0/+11 |
| * | | | | | | git branch -m: forbid renaming of a symref | Miklos Vajna | 2008-10-30 | 1 | -4/+4 |
| * | | | | | | Fix git update-ref --no-deref -d. | Miklos Vajna | 2008-10-26 | 1 | -0/+7 |
| * | | | | | | Fix git branch -m for symrefs. | Miklos Vajna | 2008-10-26 | 1 | -0/+9 |
* | | | | | | | Merge branch 'np/index-pack' | Junio C Hamano | 2008-11-02 | 1 | -27/+65 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | improve index-pack tests | Nicolas Pitre | 2008-10-22 | 1 | -27/+65 |
* | | | | | | | | Merge branch 'sh/rebase-i-p' | Junio C Hamano | 2008-11-02 | 1 | -0/+135 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rebase-i-p: if todo was reordered use HEAD as the rewritten parent | Stephen Haberman | 2008-10-16 | 1 | -2/+2 |
| * | | | | | | | | rebase-i-p: test to exclude commits from todo based on its parents | Stephen Haberman | 2008-10-16 | 1 | -0/+135 |
* | | | | | | | | | Merge branch 'ag/blame-encoding' | Junio C Hamano | 2008-11-02 | 4 | -0/+98 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | builtin-blame: Reencode commit messages according to git-log rules. | Alexander Gavrilov | 2008-10-21 | 4 | -0/+98 |
* | | | | | | | | | | Introduce receive.denyDeletes | Jan Krüger | 2008-11-02 | 1 | -0/+11 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-10-31 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Use test-chmtime -v instead of perl in t5000 to get mtime of a file | Alex Riesen | 2008-10-31 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-10-26 | 1 | -0/+21 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | git-archive: work in bare repos | Charles Bailey | 2008-10-26 | 1 | -0/+21 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | git-remote: list branches in vertical lists | Johannes Sixt | 2008-10-22 | 1 | -5/+9 |
* | | | | | | | | | rm: loosen safety valve for empty files | Jeff King | 2008-10-22 | 1 | -0/+13 |
* | | | | | | | | | Merge branch 'jk/diff-convfilter' | Junio C Hamano | 2008-10-21 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t4012: use test_cmp instead of cmp | Jeff King | 2008-10-18 | 1 | -2/+2 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'js/maint-fetch-update-head' | Junio C Hamano | 2008-10-21 | 5 | -3/+27 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | pull: allow "git pull origin $something:$current_branch" into an unborn branch | Junio C Hamano | 2008-10-17 | 1 | -0/+12 |
| * | | | | | | | | Fix fetch/pull when run without --update-head-ok | Johannes Schindelin | 2008-10-13 | 4 | -3/+15 |
* | | | | | | | | | Merge branch 'jc/maint-co-track' | Junio C Hamano | 2008-10-21 | 1 | -6/+20 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | Enhance hold_lock_file_for_{update,append}() API | Junio C Hamano | 2008-10-19 | 1 | -1/+1 |
| * | | | | | | | | demonstrate breakage of detached checkout with symbolic link HEAD | Junio C Hamano | 2008-10-19 | 1 | -0/+12 |
| * | | | | | | | | Fix "checkout --track -b newbranch" on detached HEAD | Junio C Hamano | 2008-10-17 | 1 | -6/+8 |
* | | | | | | | | | Merge branch 'jk/fix-ls-files-other' | Junio C Hamano | 2008-10-21 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/maint-ls-files-other' into jk/fix-ls-files-other | Junio C Hamano | 2008-10-17 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | * | | | | | | | refactor handling of "other" files in ls-files and status | Jeff King | 2008-10-17 | 1 | -0/+6 |
| | |/ / / / / / | |||||
* | | | | | | | | Merge branch 'jc/maint-reset-remove-unmerged-new' | Junio C Hamano | 2008-10-21 | 1 | -0/+60 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | reset --hard/read-tree --reset -u: remove unmerged new paths | Junio C Hamano | 2008-10-18 | 1 | -0/+60 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-10-21 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | / / | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | rehabilitate 'git index-pack' inside the object store | Nicolas Pitre | 2008-10-21 | 1 | -0/+10 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-10-20 | 1 | -4/+6 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Fix testcase failure when extended attributes are in use | Junio C Hamano | 2008-10-19 | 1 | -4/+6 |
| * | | | | | | Merge branch 'db/maint-checkout-b' into maint | Junio C Hamano | 2008-10-18 | 1 | -0/+10 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | tests: shell negation portability fix | Jeff King | 2008-10-17 | 1 | -1/+1 |
| | |_|_|/ / / | |/| | | | | |