aboutsummaryrefslogtreecommitdiff
path: root/git
Commit message (Collapse)AuthorAgeFilesLines
* Allow merge commits to masterTom Ryder2019-06-101-0/+3
|
* Remove push.followTags from Git configTom Ryder2019-05-301-1/+0
|
* Restore commit.status = false in gitconfigTom Ryder2019-05-301-0/+3
|
* Restore fetch.output = compact in gitconfigTom Ryder2019-05-301-0/+3
|
* Restore git push.followTagsTom Ryder2019-05-301-0/+1
|
* Restore log settingsTom Ryder2019-05-301-0/+4
|
* Restore Git merge.log config to 1024 commitsTom Ryder2019-05-301-0/+1
|
* Remove most of git config; time to review itTom Ryder2019-05-301-46/+0
|
* Add init.templateDir to gitconfigTom Ryder2019-05-291-0/+3
|
* Add pre-commit hookTom Ryder2019-05-291-0/+12
|
* Remove execute bit from Git hook sourceTom Ryder2019-05-291-0/+0
|
* Skip blanks around ignored lines in merge commitsTom Ryder2019-05-291-3/+3
|
* Skip consecutive blanks in merge commitsTom Ryder2019-05-291-0/+4
|
* Remove unneeded regex escapeTom Ryder2019-05-291-1/+1
|
* Don't try to read hook arguments beyond the firstTom Ryder2019-05-291-0/+1
|
* Handle blank lines and comments in merge commitsTom Ryder2019-05-291-0/+3
|
* Adjust prepare-commit-msg hook to argumentsTom Ryder2019-05-291-17/+15
| | | | | | | | | <https://git-scm.com/docs/githooks#_prepare_commit_msg> > It takes one to three parameters. The first is the name of the file > that contains the commit log message. The second is the source of the > commit message, and can be: ... merge (if the commit is a merge or a > .git/MERGE_MSG file exists) ...
* Correct name of message filter hookTom Ryder2019-05-291-0/+0
|
* Add an attempt at a commit merge message filterTom Ryder2019-05-291-0/+39
| | | | | | The idea is to automatically strip out semver version number bumps from commit merge logs, and maybe other nonsense later on. Let's see how well this works.
* Add some nice comments to post-update Git hookTom Ryder2019-05-291-0/+7
|
* Add first attempt at Git template dirTom Ryder2019-05-292-0/+5
|
* Revert "Set gitconfig commit.verbose, clear com...Tom Ryder2018-08-161-1/+1
| | | | | | | | This reverts commit 88da7e0c917a82765b1972b07181305adecebd0b. Changed my mind again; decided I definitely don't like the status and diff being templated. I can always Ctrl-Z and do a status/diff I need to.
* Set gitconfig commit.verbose, clear commit.statusTom Ryder2018-07-231-1/+1
|
* Add push.followTags to Git configurationTom Ryder2018-07-221-0/+1
|
* Include up to 500 commit messages in merge logTom Ryder2018-07-071-1/+1
| | | | If I want to reduce it, I'll make Vim do it.
* Always add --log to `git merge`Tom Ryder2018-01-181-0/+1
|
* Refactor m4 macro namesTom Ryder2017-06-131-4/+4
| | | | mi5(1df) means I can simplify these quite a bit now
* Use mi5 to make templated shell scriptsTom Ryder2017-06-021-0/+0
|
* Move existing .m4 to .m4.mi5Tom Ryder2017-06-021-4/+4
| | | | Along with accompanying Makefile rules and .gitignorances
* Use consistent m4 prefixTom Ryder2017-03-231-4/+4
|
* Make "amend" a shortcut for "commit --amend"Tom Ryder2016-09-161-0/+1
|
* Add git `ls` aliasTom Ryder2016-09-091-0/+1
| | | | Seems useful enough
* Add "fuckit" alias to Git configurationTom Ryder2016-09-091-0/+1
|
* Don't show diffs in a pagerTom Ryder2016-08-301-0/+3
|
* Show all untracked files in git-statusTom Ryder2016-08-211-0/+1
|
* Use compact and prune for git-fetch(1)Tom Ryder2016-08-211-0/+4
|
* Try the patience diff algorithmTom Ryder2016-08-211-0/+1
|
* Don't show comments in $EDITOR for git commitTom Ryder2016-08-211-0/+3
|
* Use strongest compression in GitTom Ryder2016-08-211-0/+3
|
* Ignore some more git status adviceTom Ryder2016-08-211-0/+1
|
* Only pull if rebase possibleTom Ryder2016-08-171-0/+3
| | | | Force me to fetch and merge properly otherwise
* Silence a couple of Git hintsTom Ryder2016-08-151-0/+2
|
* git push.default from "matching" to "current"Tom Ryder2016-08-141-1/+1
|
* Don't fast-forward my mergesTom Ryder2016-08-101-0/+3
| | | | | | <http://stackoverflow.com/a/6810687> I'll rebase if I do want this.
* Make sendmail(1) implementation configurableTom Ryder2016-07-041-0/+4
| | | | Include it in the sendemail section of the Git config, too
* Add decorate option to log configTom Ryder2016-07-041-0/+1
|
* Correct static values in gitconfig m4 templateTom Ryder2016-07-041-3/+3
|
* Template .gitconfig personal valuesTom Ryder2016-07-042-39/+32
| | | | | | | Doing this in preference to relying on GIT_* environment variables. I don't like the default values in the Makefile very much; I'll need to figure out something nicer at some point.
* Use short statusesTom Ryder2016-04-071-0/+3
|
* Remove blank lines at end of filesTom Ryder2016-03-281-1/+0
|