Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'sh/maint-rebase3' | Junio C Hamano | 2008-10-19 | 1 | -0/+139 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rebase--interactive: fix parent rewriting for dropped commits | Stephen Haberman | 2008-10-16 | 1 | -0/+139 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'mv/clonev' | Junio C Hamano | 2008-10-19 | 1 | -0/+13 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Implement git clone -v | Miklos Vajna | 2008-10-09 | 1 | -0/+13 |
* | | | | | | | Merge branch 'dp/checkattr' | Junio C Hamano | 2008-10-19 | 1 | -0/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | check-attr: Add --stdin option | Dmitry Potapov | 2008-10-12 | 1 | -0/+17 |
* | | | | | | | | Merge branch 'gb/formatpatch-autonbr' | Junio C Hamano | 2008-10-19 | 12 | -24/+286 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | format-patch: autonumber by default | Brian Gernhardt | 2008-10-18 | 12 | -24/+286 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'sp/describe-lwtag' | Junio C Hamano | 2008-10-19 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | describe: Make --tags and --all match lightweight tags more often | Shawn O. Pearce | 2008-10-17 | 1 | -4/+4 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'ae/preservemerge' | Junio C Hamano | 2008-10-19 | 1 | -0/+61 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rebase: Support preserving merges in non-interactive mode | Andreas Ericsson | 2008-09-30 | 1 | -0/+61 |
* | | | | | | | | | Merge branch 'mv/merge-noff' | Junio C Hamano | 2008-10-19 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | builtin-commit: use reduce_heads() only when appropriate | Miklos Vajna | 2008-10-03 | 1 | -0/+16 |
* | | | | | | | | | | Merge branch 'ns/rebase-noverify' | Junio C Hamano | 2008-10-19 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | rebase --no-verify | Nanako Shiraishi | 2008-10-06 | 1 | -0/+16 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-10-17 | 3 | -1/+35 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | 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 |
| * | | | | | | | | | t4018-diff-funcname: demonstrate end of line funcname matching flaw | Brandon Casey | 2008-10-16 | 1 | -0/+6 |
| * | | | | | | | | | t4018-diff-funcname: rework negated last expression test | Brandon Casey | 2008-10-16 | 1 | -1/+2 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | Add testcase to ensure merging an early part of a branch is done properly | Miklos Vajna | 2008-10-14 | 1 | -0/+26 |
* | | | | | | | | | t4018-diff-funcname: add objective-c xfuncname pattern to syntax test | Brandon Casey | 2008-10-14 | 1 | -1/+1 |
* | | | | | | | | | tests: shell negation portability fix | Jeff King | 2008-10-13 | 1 | -1/+1 |
| |_|_|_|/ / / / |/| | | | | | | | |||||
* | | | | | | | | Merge branch 'maint' | Shawn O. Pearce | 2008-10-12 | 2 | -1/+53 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | test-lib: fix broken printf | Shawn O. Pearce | 2008-10-12 | 1 | -1/+1 |
| * | | | | | | | git apply --directory broken for new files | Jeff King | 2008-10-12 | 1 | -0/+52 |
* | | | | | | | | "git diff <tree>{3,}": do not reverse order of arguments | Matt McCutchen | 2008-10-12 | 2 | -0/+30 |
* | | | | | | | | t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-' | Brandon Casey | 2008-10-12 | 1 | -1/+1 |