summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | extend rev-parse test for --is-inside-work-treeMatthias Lederhofer2007-06-061-12/+17
| * | | | | | introduce GIT_WORK_TREE to specify the work treeMatthias Lederhofer2007-06-061-0/+1
| * | | | | | test git rev-parseMatthias Lederhofer2007-06-061-0/+72
* | | | | | | Merge branch 'fl/config'Junio C Hamano2007-06-302-3/+49
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | config: add support for --bool and --int while setting valuesFrank Lichtenheld2007-06-262-3/+49
* | | | | | | Merge branch 'cr/tag'Junio C Hamano2007-06-305-0/+1041
|\ \ \ \ \ \ \
| * | | | | | | Add test-script for git-tagCarlos Rica2007-06-284-0/+686
| * | | | | | | Add test script for git-stripspace.Carlos Rica2007-06-261-0/+355
| |/ / / / / /
* | | | | | | Avoid perl in t1300-repo-configAlex Riesen2007-06-281-12/+10
|/ / / / / /
* | | | | | config: Add --null/-z option for null-delimted outputFrank Lichtenheld2007-06-261-0/+32
* | | | | | Merge branch 'maint'Junio C Hamano2007-06-262-12/+24
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | config: Change output of --get-regexp for valueless keysFrank Lichtenheld2007-06-261-0/+6
| * | | | cleanup merge-base test scriptSam Vilain2007-06-261-12/+18
| * | | | git-branch --track: fix tracking branch computation.Junio C Hamano2007-06-151-4/+12