home/dotfiles
2
0
Fork 0
mirror of https://github.com/wahyd4/dotfiles.git synced 2026-08-09 04:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
669 Commits 1 Branch 0 Tags
master
Commit Graph
43 Commits
Author SHA1 Message Date
Cătălin MarișandMathias Bynens cc5a019cef .gitconfig: Improve mpr command 
Change the `mpr` command so that it merges the specified pull request into the current branch¹, or if a branch name is specified², into the specified branch.

¹ git mpr <number>
² git mpr <number> <branch_name>

Closes #607.
 2015-12-01 13:30:02 +01:00
Mathias Bynens c31450229d .gitconfig: Use hexdump to diff binary files 2015-07-09 20:04:27 +02:00
Mathias Bynens f795b347aa .gitconfig: Add push.followTags 
Thanks to @sindresorhus: https://twitter.com/sindresorhus/status/596347008975241216
 2015-05-07 18:30:58 +02:00
Mathias Bynens 7d012c593c .gitconfig: Add retag 2015-01-26 15:24:18 +01:00
Michael KühnelandMathias Bynens b887f3a6cc .gitconfig: Prevent showing files whose names contain non-ASCII symbols as unversioned 
http://michael-kuehnel.de/git/2014/11/21/git-mac-osx-and-german-umlaute.html

Closes #460.
 2014-12-19 10:05:20 +01:00
Cătălin MarișandMathias Bynens ab9c1785d8 .gitconfig: Add alias to merge GitHub pull request 
Ref. https://help.github.com/articles/checking-out-pull-requests-locally

Closes #422.
 2014-09-20 08:48:51 +02:00
Haralan DobrevandMathias Bynens 1f8d15030c .gitconfig: Add default Git push.default config 
Use the backwards-compatible `matching` setting by default. On machines with newer Git installations, it avoids the annoying Git warning, and it can be overriden to use `simple` instead in `~/.extra`.

Closes #400.
 2014-06-14 13:32:19 +02:00
Mathias Bynens e0caaf75a1 .gitconfig: Tweak diff colors 2014-06-08 11:55:35 +02:00
Mathias Bynens 0823193f6b .gitconfig: Remove push.default 
This was causing issues on servers that don’t have an up-to-date Git installation. As a workaround, I decided to remove this from `.gitconfig` and add this to `~/.extra` for my laptop only:

    git config --global push.default simple
 2014-06-08 11:16:57 +02:00
Haralan DobrevandMathias Bynens a2cc53c7c8 .gitconfig: Improve configuration 
Closes #366.
 2014-06-07 16:35:44 +02:00
Mathias Bynens 3b4eb3efb6 Remove some things that I don’t use 
This commit drops some aliases, functions, and settings from the project that I wasn’t using at all. It also cleans up some of the remaining code.
 2014-06-07 15:59:44 +02:00
Thanasis PolychronakisandMathias Bynens 45d8e0ddbb .gitconfig: Make sure go never overrides branches 
Closes #357. Thanks to @yukideluxe!
 2014-05-07 15:04:55 +02:00
Luveen Rupchand WadhwaniandMathias Bynens c62ff1628b .gitconfig: Explicitly disable indent-with-non-tab 
Don’t use `indent-with-non-tab`. This config flag is PERNICIOUS. If turned on, Git won’t tell you that you indented your code incorrectly. Instead, when it is pushing your changes to your remote repo, Git will silently convert any consecutive 8-space strings it sees into tab characters. This can be highly undesirable, especially if you collaborate with a team that expects the code to be indented using spaces instead of tabs.

At the very least, the comment above this line should very clearly explain the fact that `indent-with-non-tab` does more than advertised in the `git-config man page (https://www.kernel.org/pub/software/scm/git/docs/git-config.html).

Closes #351.
 2014-03-05 08:37:45 +01:00
Jarrett DrouillardandMathias Bynens 6c16e6b93c .gitconfig: Add dm alias 
`git dm` deletes local branches that have been merged with master.

Closes #309.
 2013-12-13 12:33:20 +01:00
solygenandMathias Bynens 5cdfccf8f5 .gitconfig: Add aliases to find branches/tags/commits 
Closes #304.
 2013-12-08 14:47:01 +01:00
Mathias Bynens b36561c2df .gitconfig: Make git rebase safer on OS X 
See <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>.

Closes #291.
 2013-11-26 10:04:14 +01:00
Kevin SuttleandMathias Bynens c8a48ee28c .gitconfig: Add note about whitespace defaults 
Closes #256.
 2013-09-19 17:27:52 +02:00
Sindre SorhusandMathias Bynens 5c896ab0ef .gitconfig: Add comment about color.ui in Git ≥ 1.8.4 
Ref. #239.
 2013-09-07 15:49:43 +02:00
Dean SoferandMathias Bynens 3803a98eaf .gitconfig: Remove global remote branch 
This causes duplicate remotes to be created, potentially leading Git to throw errors when `push`ing.

Closes #215.
 2013-08-08 10:47:56 +02:00
Mathias Bynens fd2e47d447 .gitconfig: Improve display of astral Unicode symbols in diffs 
Thanks to @holman for the tip: https://speakerdeck.com/holman/more-git-and-github-secrets?slide=38
 2013-07-25 15:23:04 +02:00
Mathias Bynens 44e73b9b7b .gitconfig: Tweak l alias 2013-06-07 11:39:20 +02:00
Mathias Bynens 982ee2f018 .gitconfig: Use push.default = matching 
I couldn’t get used to `simple`.
 2013-05-09 17:09:00 +02:00
Mathias Bynens cc7bf5649b .gitconfig: Remove the destructive undopush alias 2013-03-17 09:22:25 +01:00
Mathias Bynens 38d3c6c61f Use newlines at EOF consistently 2013-03-10 11:07:15 +01:00
Mathias Bynens b96cd30e35 .gitconfig: Set push.default = simple 
This will be the default in Git v2.
 2012-11-19 11:24:52 +01:00
Mathias Bynens 6e58c9b16e .gitconfig: Explain diff-related aliases 2012-09-01 19:23:37 +02:00
Dominik PoradaandMathias Bynens bfa4d80970 .gitconfig: Tweak diff aliases 2012-08-31 15:51:05 +02:00
Dominik PoradaandMathias Bynens 61748c9999 .gitconfig: Add reb alias 
Stolen from https://github.com/porada/dotfiles/commit/05162b585b2e9cd6a92f12e1c61e1f5687104a17.
 2012-08-27 09:22:31 +02:00
Mathias Bynens 9e28a886b6 .gitconfig: Tweak ca alias 
Thanks to @necolas! https://github.com/mathiasbynens/dotfiles/commit/15d4c9583d66be40a497706134b637e8c1f10ae6#commitcomment-1416521
 2012-06-05 12:36:48 +02:00
Mathias Bynens 15d4c9583d .gitconfig: Show the diff when writing a commit message 
Thanks to @miketaylr: http://twitter.com/miketaylr/status/209688450868326400
 2012-06-04 22:42:39 +02:00
Mathias Bynens 4daba2f2c0 .gitconfig: Add tags, branches and remotes aliases 2012-06-04 16:37:45 +02:00
Mathias Bynens dbf0b7ebf4 .gitconfig: Add credit alias to quickly change the author of the latest commit 
Inspired by @holman’s https://github.com/holman/dotfiles/blob/master/bin/git-credit.
 2012-05-23 11:38:56 +02:00
Mathias Bynens 71e318cb0c .gitconfig: Make git ca remove deleted files, too 2012-04-23 10:50:16 +02:00
Mathias Bynens 4f4c3421d0 .gitconfig: Use origin as the default remote on the master branch 
Apparently there are cases where this is not the default: http://stackoverflow.com/q/658885/96656

Hat tip to @cowboy.
 2012-03-13 15:28:48 +01:00
Mathias Bynens c7809475f8 .gitconfig: Add d alias 2012-02-19 23:11:35 +01:00
Mathias Bynens 3ba08cb6e2 .gitconfig: Add c alias which clones a repository including all submodules 2012-02-16 11:17:38 +01:00
Mathias Bynens b8602fe924 .gitconfig: Add go and ca aliases 2012-02-14 18:20:10 +01:00
Mathias Bynens c625c47054 .gitconfig: Add comments 2012-02-14 18:07:11 +01:00
Mathias Bynens 10eed3c55b Move undopush alias to .gitconfig, as suggested by @necolas 
Also, add some other Git aliases while we’re at it.
 2012-02-14 17:24:12 +01:00
Mathias Bynens acfce9eda5 Typo. 2011-09-26 10:30:00 +03:00
Mathias Bynens 4d1573729f Fix .gitconfig formatting (use tabs instead of spaces). 2011-09-26 10:29:34 +03:00
Mathias Bynens df229c4fa8 Whitespace cleanup. 2011-09-05 20:19:31 +02:00
Mathias Bynens 7d022705ed Initial commit. 2011-09-05 20:08:58 +02:00