Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | chain kill signals for cleanup functions | Jeff King | 2009-01-21 | 1 | -0/+22 |
* | t7501-commit.sh: explicitly check that -F prevents invoking the editor | Adeodato Simó | 2009-01-10 | 2 | -4/+21 |
* | filter-branch: add git_commit_non_empty_tree and --prune-empty. | Pierre Habouzit | 2009-01-10 | 1 | -0/+8 |
* | Merge branch 'rs/diff-ihc' | Junio C Hamano | 2009-01-07 | 1 | -0/+92 |
|\ | |||||
| * | diff: add option to show context between close hunks | René Scharfe | 2008-12-29 | 1 | -0/+92 |
* | | Merge branch 'js/maint-merge-recursive-r-d-conflict' | Junio C Hamano | 2009-01-07 | 1 | -0/+23 |
|\ \ | |||||
| * | | merge-recursive: mark rename/delete conflict as unmerged | Johannes Schindelin | 2008-12-24 | 1 | -0/+23 |
* | | | Merge branch 'cb/merge-recursive-fix' | Junio C Hamano | 2009-01-07 | 1 | -0/+87 |
|\ \ \ | |||||
| * \ \ | Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fix | Junio C Hamano | 2008-12-15 | 1 | -0/+87 |
| |\ \ \ | |||||
| | * | | | merge-recursive: do not clobber untracked working tree garbage | Junio C Hamano | 2008-12-15 | 1 | -1/+1 |
| | * | | | modify/delete conflict resolution overwrites untracked file | Clemens Buchacher | 2008-12-15 | 1 | -0/+87 |
* | | | | | Merge branch 'jc/maint-do-not-switch-to-non-commit' | Junio C Hamano | 2009-01-03 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | git checkout: do not allow switching to a tree-ish that is not a commit | Junio C Hamano | 2009-01-03 | 1 | -0/+4 |
* | | | | | | Merge branch 'ap/maint-apply-modefix' | Junio C Hamano | 2009-01-03 | 1 | -0/+62 |
|\ \ \ \ \ \ | |||||
| * | | | | | | builtin-apply: prevent non-explicit permission changes | Junio C Hamano | 2009-01-02 | 1 | -0/+62 |
* | | | | | | | Merge branch 'np/auto-thread' | Junio C Hamano | 2008-12-29 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Force t5302 to use a single thread | Johannes Schindelin | 2008-12-15 | 1 | -0/+1 |
* | | | | | | | Merge branch 'sp/maint-describe-all-tag-warning' into maint | Junio C Hamano | 2008-12-27 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | describe: Avoid unnecessary warning when using --all | Shawn O. Pearce | 2008-12-26 | 1 | -0/+6 |
* | | | | | | | Merge branch 'js/rebase-i-p' | Junio C Hamano | 2008-12-24 | 1 | -11/+45 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rebase -i -p: leave a --cc patch when a merge could not be redone | Johannes Schindelin | 2008-12-24 | 1 | -0/+1 |
| * | | | | | | | rebase -i -p: Fix --continue after a merge could not be redone | Johannes Sixt | 2008-12-21 | 1 | -1/+1 |
| * | | | | | | | Show a failure of rebase -p if the merge had a conflict | Johannes Sixt | 2008-12-21 | 1 | -11/+44 |
* | | | | | | | | t9129: skip the last three tests if UTF-8 locale is not available | Miklos Vajna | 2008-12-22 | 1 | -13/+17 |
* | | | | | | | | Make sure lockfiles are unlocked when dying on SIGPIPE | Junio C Hamano | 2008-12-21 | 1 | -0/+17 |
* | | | | | | | | git-sh-setup: Fix scripts whose PWD is a symlink into a git work-dir | Marcel M. Cary | 2008-12-21 | 2 | -0/+115 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'maint' to sync with GIT 1.6.0.6 | Junio C Hamano | 2008-12-19 | 2 | -0/+38 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | fast-import: make tagger information optional | Junio C Hamano | 2008-12-19 | 1 | -0/+18 |
| * | | | | | | fast-export: deal with tag objects that do not have a tagger | Johannes Schindelin | 2008-12-19 | 1 | -0/+20 |
* | | | | | | | test overlapping ignore patterns | Michael J Gruber | 2008-12-18 | 1 | -0/+6 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-12-15 | 1 | -0/+20 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | git-show: do not segfault when showing a bad tag | Junio C Hamano | 2008-12-15 | 1 | -0/+20 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Get rid of the last remnants of GIT_CONFIG_LOCALv1.6.1-rc3 | Johannes Schindelin | 2008-12-14 | 2 | -2/+1 |
* | | | | | git-branch: display sha1 on branch deletion | Brandon Casey | 2008-12-12 | 1 | -1/+2 |
| |_|/ / |/| | | | |||||
* | | | | Fix t4031 | Junio C Hamano | 2008-12-10 | 1 | -1/+1 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2008-12-09 | 1 | -0/+42 |
|\ \ \ \ | |/ / / | |||||
| * | | | 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 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'bc/maint-keep-pack' into maint | Junio C Hamano | 2008-12-02 | 2 | -3/+88 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'st/maint-tag' into maint | Junio C Hamano | 2008-11-30 | 1 | -0/+11 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'mk/maint-cg-push' into maint | Junio C Hamano | 2008-11-30 | 1 | -0/+50 |
| |\ \ \ \ \ \ | |||||
* | | | | | | | | diff: respect textconv in rewrite diffs | Jeff King | 2008-12-09 | 1 | -1/+23 |
* | | | | | | | | diff: fix handling of binary rewrite diffs | Jeff King | 2008-12-09 | 1 | -0/+45 |
* | | | | | | | | gitweb: Fix bug in insert_file() subroutine | Jakub Narebski | 2008-12-08 | 1 | -0/+10 |
* | | | | | | | | git-am: rename apply_opt_extra file to apply-opt | Junio C Hamano | 2008-12-05 | 1 | -1/+0 |
* | | | | | | | | Test that git-am does not lose -C/-p/--whitespace options | Junio C Hamano | 2008-12-04 | 11 | -0/+229 |
* | | | | | | | | Merge branch 'dm/svn-remote' | Junio C Hamano | 2008-12-03 | 1 | -0/+19 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-svn: Make branch use correct svn-remote | Deskin Miller | 2008-12-03 | 1 | -0/+19 |
* | | | | | | | | | Merge branch 'jc/rm-i-t-a' | Junio C Hamano | 2008-12-03 | 2 | -2/+30 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | |