summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2007-07-121-0/+50
|\
| * Teach read-tree 2-way merge to ignore intermediate symlinksJunio C Hamano2007-07-121-0/+50
* | branch --track: code cleanup and saner handling of local branchesJohannes Schindelin2007-07-111-10/+11
* | t7004: Add tests for the git tag -n option.Carlos Rica2007-07-111-1/+201
* | t0030: Add tests with consecutive text lines and others with spaces added.Carlos Rica2007-07-111-0/+51
* | t0030: Remove repeated instructions and add missing &&Carlos Rica2007-07-111-24/+13
* | Fix --cherry-pick with given pathsJohannes Schindelin2007-07-111-0/+43
* | Fix core.sharedRepository = 2Johannes Schindelin2007-07-111-0/+27
* | rerere: record resolution even if file is not in merge baseJohannes Schindelin2007-07-091-5/+39
* | Support wholesale directory renames in fast-importShawn O. Pearce2007-07-091-0/+68
* | rebase -i: remember the settings of -v, -s and -p when interruptedJohannes Schindelin2007-07-081-0/+10
* | rebase -i: handle --continue more like non-interactive rebaseJohannes Schindelin2007-07-081-1/+15
* | t7004: Skip tests for signed tags in an old version of gpg.Carlos Rica2007-07-081-0/+11
* | branch.autosetupmerge: allow boolean values, or "all"Johannes Schindelin2007-07-081-0/+9
* | Merge branch 'js/stash'Junio C Hamano2007-07-071-0/+69
|\ \
| * | Teach git-stash to "apply --index"Johannes Schindelin2007-07-061-0/+69
* | | Merge branch 'jc/diff-mark'Junio C Hamano2007-07-072-0/+72
|\ \ \
| * | | diff: honor binariness specified in attributesJunio C Hamano2007-07-071-0/+12
| * | | Fix configuration syntax to specify customized hunk header patterns.Junio C Hamano2007-07-071-3/+3
| * | | Per-path attribute based hunk header selection.Junio C Hamano2007-07-061-0/+60
| |/ /
* | | Merge branch 'maint'Junio C Hamano2007-07-071-0/+6
|\ \ \ | | |/ | |/|
| * | Fix "apply --reverse" with regard to whitespaceJohannes Schindelin2007-07-071-0/+6
* | | Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin2007-07-061-3/+20
| |/ |/|
* | filter-branch: fail gracefully when a filter failsJohannes Schindelin2007-07-051-1/+7
* | Allow rebase to run if upstream is completely mergedJohannes Sixt2007-07-041-1/+38
* | Fix t5516 to create test repo without hooksAlex Riesen2007-07-041-1/+2
* | Merge branch 'maint'Junio C Hamano2007-07-032-0/+5
|\ \ | |/
| * diff --no-index: fix --name-status with added filesJohannes Schindelin2007-07-032-0/+5
* | filter-branch: add a test for the commit removal exampleJohannes Schindelin2007-07-031-0/+35
* | Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-02109-1738/+1738
* | git-fsck: add --lost-found optionJohannes Schindelin2007-07-021-0/+35
* | format-patch: Add format.subjectprefix config optionAdam Roben2007-07-023-0/+64
* | Test 'git add' for unmerged entries when core.symlinks=false.Johannes Sixt2007-07-021-10/+17
* | Merge branch 'ew/svn'Junio C Hamano2007-07-021-0/+89
|\ \
| * | git-svn: allow dcommit to retain local merge informationEric Wong2007-06-131-0/+89
* | | Merge branch 'js/rebase'Junio C Hamano2007-07-021-0/+191
|\ \ \
| * | | Teach rebase -i about --preserve-mergesJohannes Schindelin2007-06-261-0/+22
| * | | rebase -i: provide reasonable reflog for the rebased branchJohannes Schindelin2007-06-261-0/+4
| * | | rebase -i: several cleanupsJohannes Schindelin2007-06-261-0/+2
| * | | Teach rebase an interactive modeJohannes Schindelin2007-06-241-0/+163
* | | | Merge branch 'jc/diffcore'Junio C Hamano2007-07-021-0/+33
|\ \ \ \
| * | | | diffcore-delta.c: Ignore CR in CRLF for text filesJunio C Hamano2007-06-301-0/+33
* | | | | Merge branch 'jc/quote'Junio C Hamano2007-07-011-0/+126
|\ \ \ \ \
| * | | | | Add core.quotepath configuration variable.Junio C Hamano2007-06-241-0/+126
| | |/ / / | |/| | |
* | | | | Fix t5516-fetch for systems where `wc -l` outputs whitespace.Brian Gernhardt2007-07-011-2/+2
* | | | | git add: respect core.filemode with unmerged entriesJohannes Schindelin2007-07-011-0/+26
* | | | | t7004: ship trustdb to avoid gpg warningsJohannes Schindelin2007-07-011-0/+0
* | | | | Merge branch 'ei/worktree+filter'Junio C Hamano2007-07-013-0/+170
|\ \ \ \ \
| * \ \ \ \ Merge branch 'js/filter' into ei/worktree+filterJunio C Hamano2007-06-061-0/+57
| |\ \ \ \ \
| * | | | | | test GIT_WORK_TREEMatthias Lederhofer2007-06-061-0/+92
View Lorry Controller Status