Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | git add --intent-to-add: do not let an empty blob be committed by accident | Junio C Hamano | 2008-11-30 | 1 | -0/+28 |
| * | | | | | | git add --intent-to-add: fix removal of cached emptiness | Junio C Hamano | 2008-11-28 | 1 | -2/+2 |
* | | | | | | | t4030-diff-textconv: Make octal escape sequence more portable | Johannes Sixt | 2008-12-02 | 1 | -1/+1 |
* | | | | | | | bisect: fix "git bisect skip <commit>" and add tests cases | Christian Couder | 2008-12-02 | 1 | -1/+18 |
* | | | | | | | send-email: do not reverse the command line arguments | Junio C Hamano | 2008-11-30 | 1 | -0/+13 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'ta/quiet-pull' | Junio C Hamano | 2008-11-27 | 1 | -0/+60 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Teach/Fix pull/fetch -q/-v options | Tuncer Ayaz | 2008-11-14 | 1 | -0/+60 |
* | | | | | | | Merge branch 'ph/send-email' | Junio C Hamano | 2008-11-27 | 1 | -0/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git send-email: interpret unknown files as revision lists | Pierre Habouzit | 2008-11-11 | 1 | -0/+8 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-11-27 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | 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 |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2008-11-26 | 1 | -0/+21 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Teach "git diff" to honour --[no-]ext-diff | Junio C Hamano | 2008-11-26 | 1 | -0/+21 |
| |/ / / / / / / | |||||
* | | | | | | | | t9129-git-svn-i18n-commitencoding: Make compare_svn_head_with() compatible wi... | Marcel Koeppen | 2008-11-26 | 1 | -1/+1 |
* | | | | | | | | Fix t4030-diff-textconv.sh | Alex Riesen | 2008-11-23 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'bc/maint-keep-pack' | Junio C Hamano | 2008-11-16 | 1 | -3/+15 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | repack: only unpack-unreachable if we are deleting redundant packs | Brandon Casey | 2008-11-14 | 1 | -3/+15 |