Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
envrcd
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
isgphys
envrcd
Commits
b41c6245
Commit
b41c6245
authored
1 year ago
by
Sven Mäder
Browse files
Options
Downloads
Patches
Plain Diff
Enable automatic rebasing with autostash by default, add git adogg
parent
0f01c6fb
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
profile/default/.gitconfig
+7
-5
7 additions, 5 deletions
profile/default/.gitconfig
profile/rda/.gitconfig
+4
-3
4 additions, 3 deletions
profile/rda/.gitconfig
with
11 additions
and
8 deletions
profile/default/.gitconfig
+
7
−
5
View file @
b41c6245
...
...
@@ -63,14 +63,15 @@
default
=
simple
[pull]
# Only pull if fast-forward is possible. Use `git pull --rebase` or `git pull --no-ff` otherwise.
# Only pull if fast-forward is possible. Use `git pull --rebase` or `git pull --no-ff` alternatively.
# Do not set `ff = only` in combination with `rebase = true` to allow automatic rebasing of local commits.
#ff = only
# Use `git pull --rebase` by default,
otherwise
use `git fetch; git merge`
#
rebase = true
# Use `git pull --rebase` by default,
alternatively
use `git fetch; git merge`
(discouraged in most situations)
rebase
=
true
[rebase]
# Automatically stash and pop your uncommitted changes
#
autoStash = true
# Automatically stash and pop your uncommitted changes
while rebasing
autoStash
=
true
[alias]
co
=
checkout
...
...
@@ -108,3 +109,4 @@
adogd
=
!"git adogb --date=format:'%Y-%m-%d %H:%M:%S' --format=format:'%C(#d7ff5f)%h%C(reset)%C(auto)%d%C(reset) %C(normal)%s%C(reset) %C(#5fd7ff)%an%C(reset) %C(#d7d7ff)(%ad)%C(reset)'"
adogj
=
!"git adogv"
adog
=
!"git adogv"
adogg
=
!"git adogv -i --grep"
This diff is collapsed.
Click to expand it.
profile/rda/.gitconfig
+
4
−
3
View file @
b41c6245
...
...
@@ -74,13 +74,14 @@
default
=
simple
[pull]
# Only pull if fast-forward is possible. Use `git pull --rebase` or `git pull --no-ff` otherwise.
# Only pull if fast-forward is possible. Use `git pull --rebase` or `git pull --no-ff` alternatively.
# Do not set `ff = only` in combination with `rebase = true` to allow automatic rebasing of local commits.
ff
=
only
# Use `git pull --rebase` by default,
otherwise
use `git fetch; git merge`
# Use `git pull --rebase` by default,
alternatively
use `git fetch; git merge`
(discouraged in most situations)
#rebase = true
[rebase]
# Automatically stash and pop your uncommitted changes
# Automatically stash and pop your uncommitted changes
while rebasing
#autoStash = true
[alias]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment