9 Commits

Author	SHA1	Message	Date
Joe Groocock	cfbe6d6f0f	git: Allow git cleanmerged/defbranch to take args ... These aliases now make zero assumptions about either branch or origin names. They default to origin, and the primary branch is determined from the refs/remotes/$remote/HEAD symbolic-ref, which will be pulled from the remote if it's not known locally. With these it is now possible to act on any remote/branch combination: # Get default branch for 'upstream' remote $ git defbranch upstream # Delete branches merged into the default branch of the 'upstream' # remote $ git cleanmerged upstream # Delete branches merged into the upstream/foo branch $ git cleanmerged upstream foo Signed-off-by: Joe Groocock <me@frebib.net>	2022-10-24 14:51:42 +00:00
Joe Groocock	509551f717	git: Add mv/reflog/clean-merged aliases ... Signed-off-by: Joe Groocock <me@frebib.net>	2022-10-24 14:29:40 +00:00
Joe Groocock	ba6173e0ee	git: Dynamically identify the "default" branch ... This broadly assumes that the "default" remote is called "origin", but that's better than assuming that plus the default branch name. Thanks to https://joshtronic.com/2020/08/09/how-to-get-the-default-git-branch/ Suggested-by: Chris Lane <chris@chrislane.com> Signed-off-by: Joe Groocock <me@frebib.net>	2022-08-31 20:43:06 +00:00
Joe Groocock	8e74101f3e	git: Fetch GitHub pull request refs by default ... I can't find a way to make this a wildcard that applies to all remotes, so this adds the two most common remotes that I'm likely to use. Signed-off-by: Joe Groocock <me@frebib.net>	2021-11-23 11:21:45 +00:00
Joe Groocock	898190a99f	git: Use fast-forward-only merge by default ... Merge commits are nasty, so make sure they're only created explicitly and never by default. Signed-off-by: Joe Groocock <me@frebib.net>	2021-11-23 11:16:08 +00:00
Joe Groocock	24dfc13c3f	git: log/show dates in ISO8601 in UTC ... Consistency is key. Timezones are the devil. Signed-off-by: Joe Groocock <me@frebib.net>	2021-05-25 09:58:32 +00:00
Joe Groocock	b1eecdbbda	git: suppress detached-head warning. I-know-what-I-am-doing ... git is not for the weak. Warnings are not for the knowing. Shut up git. Signed-off-by: Joe Groocock <me@frebib.net>	2021-01-07 15:34:18 +00:00
Joe Groocock	1b3672b983	git: suppress default branch babble warning ... Shut up and just make me a repo without complaining will you. Signed-off-by: Joe Groocock <me@frebib.net>	2021-01-07 15:34:18 +00:00
Joe Groocock	60bf423556	dotfiles: move .config/* to root ... This seems to make more sense. Almost all files were within .config anyway. Signed-off-by: Joe Groocock <me@frebib.net>	2020-08-10 22:42:14 +01:00