Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Teach fast-import to recursively copy files/directories | Shawn O. Pearce | 2007-07-15 | 1 | -0/+83 |
* | rerere: record resolution even if file is not in merge base | Johannes Schindelin | 2007-07-09 | 1 | -5/+39 |
* | Support wholesale directory renames in fast-import | Shawn O. Pearce | 2007-07-09 | 1 | -0/+68 |
* | rebase -i: remember the settings of -v, -s and -p when interrupted | Johannes Schindelin | 2007-07-08 | 1 | -0/+10 |
* | rebase -i: handle --continue more like non-interactive rebase | Johannes Schindelin | 2007-07-08 | 1 | -1/+15 |
* | t7004: Skip tests for signed tags in an old version of gpg. | Carlos Rica | 2007-07-08 | 1 | -0/+11 |
* | branch.autosetupmerge: allow boolean values, or "all" | Johannes Schindelin | 2007-07-08 | 1 | -0/+9 |
* | Merge branch 'js/stash' | Junio C Hamano | 2007-07-07 | 1 | -0/+69 |
|\ | |||||
| * | Teach git-stash to "apply --index" | Johannes Schindelin | 2007-07-06 | 1 | -0/+69 |
* | | Merge branch 'jc/diff-mark' | Junio C Hamano | 2007-07-07 | 2 | -0/+72 |
|\ \ | |||||
| * | | diff: honor binariness specified in attributes | Junio C Hamano | 2007-07-07 | 1 | -0/+12 |
| * | | Fix configuration syntax to specify customized hunk header patterns. | Junio C Hamano | 2007-07-07 | 1 | -3/+3 |
| * | | Per-path attribute based hunk header selection. | Junio C Hamano | 2007-07-06 | 1 | -0/+60 |
| |/ | |||||
* | | Merge branch 'maint' | Junio C Hamano | 2007-07-07 | 1 | -0/+6 |
|\ \ | |||||
| * | | Fix "apply --reverse" with regard to whitespace | Johannes Schindelin | 2007-07-07 | 1 | -0/+6 |
* | | | Enable "git rerere" by the config variable rerere.enabled | Johannes Schindelin | 2007-07-06 | 1 | -3/+20 |
| |/ |/| | |||||
* | | filter-branch: fail gracefully when a filter fails | Johannes Schindelin | 2007-07-05 | 1 | -1/+7 |
* | | Allow rebase to run if upstream is completely merged | Johannes Sixt | 2007-07-04 | 1 | -1/+38 |
* | | Fix t5516 to create test repo without hooks | Alex Riesen | 2007-07-04 | 1 | -1/+2 |
* | | Merge branch 'maint' | Junio C Hamano | 2007-07-03 | 2 | -0/+5 |
|\ \ | |/ | |||||
| * | diff --no-index: fix --name-status with added files | Johannes Schindelin | 2007-07-03 | 2 | -0/+5 |
* | | filter-branch: add a test for the commit removal example | Johannes Schindelin | 2007-07-03 | 1 | -0/+35 |
* | | Rewrite "git-frotz" to "git frotz" | Junio C Hamano | 2007-07-02 | 109 | -1738/+1738 |
* | | git-fsck: add --lost-found option | Johannes Schindelin | 2007-07-02 | 1 | -0/+35 |
* | | format-patch: Add format.subjectprefix config option | Adam Roben | 2007-07-02 | 3 | -0/+64 |
* | | Test 'git add' for unmerged entries when core.symlinks=false. | Johannes Sixt | 2007-07-02 | 1 | -10/+17 |
* | | Merge branch 'ew/svn' | Junio C Hamano | 2007-07-02 | 1 | -0/+89 |
|\ \ | |||||
| * | | git-svn: allow dcommit to retain local merge information | Eric Wong | 2007-06-13 | 1 | -0/+89 |
* | | | Merge branch 'js/rebase' | Junio C Hamano | 2007-07-02 | 1 | -0/+191 |
|\ \ \ | |||||
| * | | | Teach rebase -i about --preserve-merges | Johannes Schindelin | 2007-06-26 | 1 | -0/+22 |
| * | | | rebase -i: provide reasonable reflog for the rebased branch | Johannes Schindelin | 2007-06-26 | 1 | -0/+4 |
| * | | | rebase -i: several cleanups | Johannes Schindelin | 2007-06-26 | 1 | -0/+2 |
| * | | | Teach rebase an interactive mode | Johannes Schindelin | 2007-06-24 | 1 | -0/+163 |
* | | | | Merge branch 'jc/diffcore' | Junio C Hamano | 2007-07-02 | 1 | -0/+33 |
|\ \ \ \ | |||||
| * | | | | diffcore-delta.c: Ignore CR in CRLF for text files | Junio C Hamano | 2007-06-30 | 1 | -0/+33 |
* | | | | | Merge branch 'jc/quote' | Junio C Hamano | 2007-07-01 | 1 | -0/+126 |
|\ \ \ \ \ | |||||
| * | | | | | Add core.quotepath configuration variable. | Junio C Hamano | 2007-06-24 | 1 | -0/+126 |
| | |/ / / | |/| | | | |||||
* | | | | | Fix t5516-fetch for systems where `wc -l` outputs whitespace. | Brian Gernhardt | 2007-07-01 | 1 | -2/+2 |
* | | | | | git add: respect core.filemode with unmerged entries | Johannes Schindelin | 2007-07-01 | 1 | -0/+26 |
* | | | | | t7004: ship trustdb to avoid gpg warnings | Johannes Schindelin | 2007-07-01 | 1 | -0/+0 |
* | | | | | Merge branch 'ei/worktree+filter' | Junio C Hamano | 2007-07-01 | 3 | -0/+170 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'js/filter' into ei/worktree+filter | Junio C Hamano | 2007-06-06 | 1 | -0/+57 |
| |\ \ \ \ \ | |||||
| * | | | | | | test GIT_WORK_TREE | Matthias Lederhofer | 2007-06-06 | 1 | -0/+92 |
| * | | | | | | extend rev-parse test for --is-inside-work-tree | Matthias Lederhofer | 2007-06-06 | 1 | -12/+17 |
| * | | | | | | introduce GIT_WORK_TREE to specify the work tree | Matthias Lederhofer | 2007-06-06 | 1 | -0/+1 |
| * | | | | | | test git rev-parse | Matthias Lederhofer | 2007-06-06 | 1 | -0/+72 |
* | | | | | | | Merge branch 'fl/config' | Junio C Hamano | 2007-06-30 | 2 | -3/+49 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | config: add support for --bool and --int while setting values | Frank Lichtenheld | 2007-06-26 | 2 | -3/+49 |
* | | | | | | | Merge branch 'cr/tag' | Junio C Hamano | 2007-06-30 | 5 | -0/+1041 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add test-script for git-tag | Carlos Rica | 2007-06-28 | 4 | -0/+686 |