Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Use backticks in git-merge-one-file-script instead of $(command). | Junio C Hamano | 2005-05-07 |
* | Update git-merge-one-file-script. | Junio C Hamano | 2005-05-01 |
* | [PATCH] Really fix git-merge-one-file-script this time. | Junio C Hamano | 2005-05-01 |
* | [PATCH] leftover bits for git rename | Junio C Hamano | 2005-04-29 |
* | Update the merge scripts for the big git rename. | Linus Torvalds | 2005-04-29 |
* | [PATCH] make file merging respect permissions | James Bottomley | 2005-04-23 |
* | [PATCH] SCSI trees, merges and git status | James Bottomley | 2005-04-18 |
* | Change merge-cache and git-merge-one-file to use the SHA1 of the file | Linus Torvalds | 2005-04-18 |
* | Add the simple scripts I used to do a merge with content conflicts. | Linus Torvalds | 2005-04-18 |