Commit message (Expand) | Author | Age | |
---|---|---|---|
* | 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 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'bc/maint-keep-pack' into maint | Junio C Hamano | 2008-12-02 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'st/maint-tag' into maint | Junio C Hamano | 2008-11-30 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'mk/maint-cg-push' into maint | Junio C Hamano | 2008-11-30 |
| |\ \ \ \ \ \ | |||
* | | | | | | | | diff: respect textconv in rewrite diffs | Jeff King | 2008-12-09 |
* | | | | | | | | diff: fix handling of binary rewrite diffs | Jeff King | 2008-12-09 |
* | | | | | | | | gitweb: Fix bug in insert_file() subroutine | Jakub Narebski | 2008-12-08 |
* | | | | | | | | git-am: rename apply_opt_extra file to apply-opt | Junio C Hamano | 2008-12-05 |
* | | | | | | | | Test that git-am does not lose -C/-p/--whitespace options | Junio C Hamano | 2008-12-04 |
* | | | | | | | | Merge branch 'dm/svn-remote' | Junio C Hamano | 2008-12-03 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | git-svn: Make branch use correct svn-remote | Deskin Miller | 2008-12-03 |
* | | | | | | | | | Merge branch 'jc/rm-i-t-a' | Junio C Hamano | 2008-12-03 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||
| * | | | | | | | | git add --intent-to-add: do not let an empty blob be committed by accident | Junio C Hamano | 2008-11-30 |
| * | | | | | | | | git add --intent-to-add: fix removal of cached emptiness | Junio C Hamano | 2008-11-28 |
* | | | | | | | | | t4030-diff-textconv: Make octal escape sequence more portable | Johannes Sixt | 2008-12-02 |