aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
...
* | | | | | | | | | Merge branch 'cb/merge-recursive-fix'Junio C Hamano2009-01-07
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fixJunio C Hamano2008-12-15
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| | * | | | | | | | | merge-recursive: do not clobber untracked working tree garbageJunio C Hamano2008-12-15
| | * | | | | | | | | modify/delete conflict resolution overwrites untracked fileClemens Buchacher2008-12-15
* | | | | | | | | | | Merge branch 'jc/maint-do-not-switch-to-non-commit'Junio C Hamano2009-01-03
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | git checkout: do not allow switching to a tree-ish that is not a commitJunio C Hamano2009-01-03
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ap/maint-apply-modefix'Junio C Hamano2009-01-03
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | builtin-apply: prevent non-explicit permission changesJunio C Hamano2009-01-02
* | | | | | | | | Merge branch 'np/auto-thread'Junio C Hamano2008-12-29
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Force t5302 to use a single threadJohannes Schindelin2008-12-15
* | | | | | | | | Merge branch 'sp/maint-describe-all-tag-warning' into maintJunio C Hamano2008-12-27
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | describe: Avoid unnecessary warning when using --allShawn O. Pearce2008-12-26
* | | | | | | | | Merge branch 'js/rebase-i-p'Junio C Hamano2008-12-24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase -i -p: leave a --cc patch when a merge could not be redoneJohannes Schindelin2008-12-24
| * | | | | | | | | rebase -i -p: Fix --continue after a merge could not be redoneJohannes Sixt2008-12-21
| * | | | | | | | | Show a failure of rebase -p if the merge had a conflictJohannes Sixt2008-12-21
* | | | | | | | | | t9129: skip the last three tests if UTF-8 locale is not availableMiklos Vajna2008-12-22
* | | | | | | | | | Make sure lockfiles are unlocked when dying on SIGPIPEJunio C Hamano2008-12-21
* | | | | | | | | | git-sh-setup: Fix scripts whose PWD is a symlink into a git work-dirMarcel M. Cary2008-12-21
|/ / / / / / / / /
* | | | | | | | | Merge branch 'maint' to sync with GIT 1.6.0.6Junio C Hamano2008-12-19
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | fast-import: make tagger information optionalJunio C Hamano2008-12-19
| * | | | | | | | fast-export: deal with tag objects that do not have a taggerJohannes Schindelin2008-12-19
* | | | | | | | | test overlapping ignore patternsMichael J Gruber2008-12-18
* | | | | | | | | Merge branch 'maint'Junio C Hamano2008-12-15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | / / / / | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | git-show: do not segfault when showing a bad tagJunio C Hamano2008-12-15
| | |_|_|/ / / | |/| | | | |
* | | | | | | Get rid of the last remnants of GIT_CONFIG_LOCALv1.6.1-rc3Johannes Schindelin2008-12-14
* | | | | | | git-branch: display sha1 on branch deletionBrandon Casey2008-12-12
| |_|/ / / / |/| | | | |
* | | | | | Fix t4031Junio C Hamano2008-12-10
* | | | | | Merge branch 'maint'Junio C Hamano2008-12-09
|\ \ \ \ \ \ | |/ / / / /
| * | | | | git-svn: Make following parents atomicDeskin Miller2008-12-08
| * | | | | "git diff <tree>{3,}": do not reverse order of argumentsMatt McCutchen2008-12-07
| * | | | | Merge branch 'jk/maint-commit-v-strip' into maintJunio C Hamano2008-12-02
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'bc/maint-keep-pack' into maintJunio C Hamano2008-12-02
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'st/maint-tag' into maintJunio C Hamano2008-11-30
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mk/maint-cg-push' into maintJunio C Hamano2008-11-30
| |\ \ \ \ \ \ \ \
* | | | | | | | | | diff: respect textconv in rewrite diffsJeff King2008-12-09
* | | | | | | | | | diff: fix handling of binary rewrite diffsJeff King2008-12-09
* | | | | | | | | | gitweb: Fix bug in insert_file() subroutineJakub Narebski2008-12-08
* | | | | | | | | | git-am: rename apply_opt_extra file to apply-optJunio C Hamano2008-12-05
* | | | | | | | | | Test that git-am does not lose -C/-p/--whitespace optionsJunio C Hamano2008-12-04
* | | | | | | | | | Merge branch 'dm/svn-remote'Junio C Hamano2008-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-svn: Make branch use correct svn-remoteDeskin Miller2008-12-03
* | | | | | | | | | | Merge branch 'jc/rm-i-t-a'Junio C Hamano2008-12-03
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | git add --intent-to-add: do not let an empty blob be committed by accidentJunio C Hamano2008-11-30
| * | | | | | | | | | git add --intent-to-add: fix removal of cached emptinessJunio C Hamano2008-11-28
* | | | | | | | | | | t4030-diff-textconv: Make octal escape sequence more portableJohannes Sixt2008-12-02
* | | | | | | | | | | bisect: fix "git bisect skip <commit>" and add tests casesChristian Couder2008-12-02
* | | | | | | | | | | send-email: do not reverse the command line argumentsJunio C Hamano2008-11-30
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'ta/quiet-pull'Junio C Hamano2008-11-27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Teach/Fix pull/fetch -q/-v optionsTuncer Ayaz2008-11-14