| Commit message (Expand) | Author | Age | Files | Lines |
* | modify/delete conflict resolution overwrites untracked file | Clemens Buchacher | 2008-12-15 | 1 | -0/+87 |
* | git-svn: Make following parents atomic | Deskin Miller | 2008-12-08 | 1 | -0/+42 |
* | "git diff <tree>{3,}": do not reverse order of arguments | Matt McCutchen | 2008-12-07 | 2 | -0/+30 |
* | Merge branch 'jk/maint-commit-v-strip' into maint | Junio C Hamano | 2008-12-02 | 1 | -0/+73 |
|\ |
|
| * | commit: Fix stripping of patch in verbose mode. | Jeff King | 2008-11-12 | 1 | -0/+73 |
* | | Merge branch 'bc/maint-keep-pack' into maint | Junio C Hamano | 2008-12-02 | 2 | -3/+88 |
|\ \ |
|
| * | | repack: only unpack-unreachable if we are deleting redundant packs | Brandon Casey | 2008-11-14 | 1 | -3/+15 |
| * | | t7700: test that 'repack -a' packs alternate packed objects | Brandon Casey | 2008-11-12 | 1 | -0/+16 |
| * | | pack-objects: extend --local to mean ignore non-local loose objects too | Brandon Casey | 2008-11-12 | 1 | -1/+1 |
| * | | t7700: demonstrate mishandling of loose objects in an alternate ODB | Brandon Casey | 2008-11-12 | 1 | -0/+19 |
| * | | repack: don't repack local objects in packs with .keep file | Brandon Casey | 2008-11-12 | 1 | -1/+1 |
| * | | t7700: demonstrate mishandling of objects in packs with a .keep file | Brandon Casey | 2008-11-12 | 1 | -0/+38 |
| |/ |
|
* | | Merge branch 'st/maint-tag' into maint | Junio C Hamano | 2008-11-30 | 1 | -0/+11 |
|\ \ |
|
| * | | tag: Add more tests about mixing incompatible modes and options | Samuel Tardieu | 2008-11-04 | 1 | -0/+11 |
* | | | Merge branch 'mk/maint-cg-push' into maint | Junio C Hamano | 2008-11-30 | 1 | -0/+50 |
|\ \ \ |
|
| * | | | git push: Interpret $GIT_DIR/branches in a Cogito compatible way | Martin Koegler | 2008-11-11 | 1 | -0/+50 |
| | |/
| |/| |
|
* | | | Merge branch 'mv/fast-export' into maint | Junio C Hamano | 2008-11-27 | 1 | -0/+8 |
|\ \ \ |
|
| * | | | fast-export: use an unsorted string list for extra_refs | Johannes Schindelin | 2008-11-23 | 1 | -1/+1 |
| * | | | Add new testcase to show fast-export does not always exports all tags | Miklos Vajna | 2008-11-23 | 1 | -0/+8 |
* | | | | Teach "git diff" to honour --[no-]ext-diff | Junio C Hamano | 2008-11-26 | 1 | -0/+21 |
|/ / / |
|
* | | | Fix pack.packSizeLimit and --max-pack-size handling | Nicolas Pitre | 2008-11-12 | 1 | -0/+6 |
|/ / |
|
* | | checkout: Don't crash when switching away from an invalid branch. | Alexandre Julliard | 2008-11-09 | 1 | -0/+18 |
* | | 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 |
|\ \
| |/
|/| |
|
| * | 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 'js/maint-fetch-update-head' into maint | Junio C Hamano | 2008-11-02 | 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 'jk/maint-ls-files-other' into maint | Junio C Hamano | 2008-11-02 | 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' into maint | Junio C Hamano | 2008-11-02 | 1 | -0/+60 |
|\ \ \ \ |
|
| * | | | | reset --hard/read-tree --reset -u: remove unmerged new paths | Junio C Hamano | 2008-10-18 | 1 | -0/+60 |
* | | | | | Merge branch 'jc/maint-co-track' into maint | Junio C Hamano | 2008-11-02 | 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 |
| | |/ / /
| |/| | | |
|
* | | | | | Use test-chmtime -v instead of perl in t5000 to get mtime of a file | Alex Riesen | 2008-10-31 | 1 | -1/+1 |
* | | | | | git-archive: work in bare repos | Charles Bailey | 2008-10-26 | 1 | -0/+21 |
| |_|_|/
|/| | | |
|
* | | | | rehabilitate 'git index-pack' inside the object store | Nicolas Pitre | 2008-10-21 | 1 | -0/+10 |
* | | | | 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 |
|\ \ \ \ |
|
| * | | | | Check early that a new branch is new and valid | Daniel Barkalow | 2008-09-21 | 1 | -0/+10 |
* | | | | | tests: shell negation portability fix | Jeff King | 2008-10-17 | 1 | -1/+1 |
| |/ / /
|/| | | |
|
* | | | | t1301-shared-repo.sh: don't let a default ACL interfere with the test | Matt McCutchen | 2008-10-16 | 1 | -0/+3 |
* | | | | xdiff-interface.c: strip newline (and cr) from line before pattern matching | Brandon Casey | 2008-10-16 | 1 | -1/+1 |