Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'nd/grep-assume-unchanged' | Junio C Hamano | 2009-01-13 |
|\ | |||
| * | grep: grep cache entries if they are "assume unchanged" | Nguyễn Thái Ngọc Duy | 2008-12-27 |
* | | Merge branch 'js/bundle-tags' | Junio C Hamano | 2009-01-13 |
|\ \ | |||
| * | | bundle: allow rev-list options to exclude annotated tags | Johannes Schindelin | 2009-01-05 |
* | | | Merge branch 'js/add-not-submodule' | Junio C Hamano | 2009-01-13 |
|\ \ \ | |||
| * | | | git add: do not add files from a submodule | Johannes Schindelin | 2009-01-05 |
| | |/ | |/| | |||
* | | | Merge branch 'cb/maint-unpack-trees-absense' | Junio C Hamano | 2009-01-13 |
|\ \ \ | |||
| * | | | unpack-trees: fix path search bug in verify_absent | Clemens Buchacher | 2009-01-05 |
| * | | | unpack-trees: handle failure in verify_absent | Clemens Buchacher | 2009-01-05 |
* | | | | Merge branch 'mc/cd-p-pwd' | Junio C Hamano | 2009-01-13 |
|\ \ \ \ | |||
| * | | | | git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS X | Marcel M. Cary | 2009-01-05 |
| | |/ / | |/| | | |||
* | | | | git-svn: add --authors-file test | Eric Wong | 2009-01-11 |
* | | | | t7501-commit.sh: explicitly check that -F prevents invoking the editor | Adeodato Simó | 2009-01-10 |
* | | | | filter-branch: add git_commit_non_empty_tree and --prune-empty. | Pierre Habouzit | 2009-01-10 |
* | | | | Merge branch 'rs/diff-ihc' | Junio C Hamano | 2009-01-07 |
|\ \ \ \ | |||
| * | | | | diff: add option to show context between close hunks | René Scharfe | 2008-12-29 |
* | | | | | Merge branch 'js/maint-merge-recursive-r-d-conflict' | Junio C Hamano | 2009-01-07 |
|\ \ \ \ \ | |||
| * | | | | | merge-recursive: mark rename/delete conflict as unmerged | Johannes Schindelin | 2008-12-24 |
| | |/ / / | |/| | | | |||
* | | | | | Merge branch 'cb/merge-recursive-fix' | Junio C Hamano | 2009-01-07 |
|\ \ \ \ \ | |||
| * \ \ \ \ | Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fix | Junio C Hamano | 2008-12-15 |
| |\ \ \ \ \ | |||
| | * | | | | | merge-recursive: do not clobber untracked working tree garbage | Junio C Hamano | 2008-12-15 |
| | * | | | | | modify/delete conflict resolution overwrites untracked file | Clemens Buchacher | 2008-12-15 |
* | | | | | | | Merge branch 'jc/maint-do-not-switch-to-non-commit' | Junio C Hamano | 2009-01-03 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | git checkout: do not allow switching to a tree-ish that is not a commit | Junio C Hamano | 2009-01-03 |
| | |_|_|_|_|/ | |/| | | | | | |||
* | | | | | | | Merge branch 'ap/maint-apply-modefix' | Junio C Hamano | 2009-01-03 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | builtin-apply: prevent non-explicit permission changes | Junio C Hamano | 2009-01-02 |
* | | | | | | | | Merge branch 'np/auto-thread' | Junio C Hamano | 2008-12-29 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||
| * | | | | | | | Force t5302 to use a single thread | Johannes Schindelin | 2008-12-15 |
* | | | | | | | | Merge branch 'sp/maint-describe-all-tag-warning' into maint | Junio C Hamano | 2008-12-27 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||
| * | | | | | | | describe: Avoid unnecessary warning when using --all | Shawn O. Pearce | 2008-12-26 |
* | | | | | | | | Merge branch 'js/rebase-i-p' | Junio C Hamano | 2008-12-24 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | rebase -i -p: leave a --cc patch when a merge could not be redone | Johannes Schindelin | 2008-12-24 |
| * | | | | | | | | rebase -i -p: Fix --continue after a merge could not be redone | Johannes Sixt | 2008-12-21 |
| * | | | | | | | | Show a failure of rebase -p if the merge had a conflict | Johannes Sixt | 2008-12-21 |
* | | | | | | | | | t9129: skip the last three tests if UTF-8 locale is not available | Miklos Vajna | 2008-12-22 |
* | | | | | | | | | Make sure lockfiles are unlocked when dying on SIGPIPE | Junio C Hamano | 2008-12-21 |
* | | | | | | | | | git-sh-setup: Fix scripts whose PWD is a symlink into a git work-dir | Marcel M. Cary | 2008-12-21 |
|/ / / / / / / / | |||
* | | | | | | | | Merge branch 'maint' to sync with GIT 1.6.0.6 | Junio C Hamano | 2008-12-19 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||
| * | | | | | | | fast-import: make tagger information optional | Junio C Hamano | 2008-12-19 |
| * | | | | | | | fast-export: deal with tag objects that do not have a tagger | Johannes Schindelin | 2008-12-19 |
* | | | | | | | | test overlapping ignore patterns | Michael J Gruber | 2008-12-18 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-12-15 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | | | |||
| * | | | | | | git-show: do not segfault when showing a bad tag | Junio C Hamano | 2008-12-15 |
| | |_|_|/ / | |/| | | | | |||
* | | | | | | Get rid of the last remnants of GIT_CONFIG_LOCALv1.6.1-rc3 | Johannes Schindelin | 2008-12-14 |
* | | | | | | git-branch: display sha1 on branch deletion | Brandon Casey | 2008-12-12 |
| |_|/ / / |/| | | | | |||
* | | | | | Fix t4031 | Junio C Hamano | 2008-12-10 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2008-12-09 |
|\ \ \ \ \ | |/ / / / | |||
| * | | | | git-svn: Make following parents atomic | Deskin Miller | 2008-12-08 |
| * | | | | "git diff <tree>{3,}": do not reverse order of arguments | Matt McCutchen | 2008-12-07 |
| * | | | | Merge branch 'jk/maint-commit-v-strip' into maint | Junio C Hamano | 2008-12-02 |
| |\ \ \ \ |