tdd · October 5, 2025 17:35 · Jun 13, 2019 · Mar 5, 2019 · Mar 5, 2019 · Dec 15, 2015
diff --git a/gitconfig.ini b/gitconfig.ini
@@ -115,9 +115,12 @@
   # This is GREAT… when you know what you're doing and are careful
   # not to pull --no-rebase over a local line containing a true merge.
   # rebase = true
-  # WARNING! This option, which does away with the one gotcha of
+  # This option, which does away with the one gotcha of
   # auto-rebasing on pulls, is only available from 1.8.5 onwards.
-  rebase = preserve
+  # rebase = preserve
+  # WARNING! This option, which is the latest variation, is only
+  # available from 2.18 onwards.
+  rebase = merges
 [push]
   # Default push should only push the current branch to its push target, regardless of its remote name
   default = upstream

diff --git a/gitconfig.ini b/gitconfig.ini
@@ -1,11 +1,11 @@
 # Put this in your ~/.gitconfig or ~/.config/git/config
 # Windows users: "~" is your profile's home directory, e.g. C:\Users\<YourName>
 [user]
-	name = Your Full Name
-	email = [email protected]
+  name = Your Full Name
+  email = [email protected]
 [color]
-	# Enable colors in color-supporting terminals
-	ui = auto
+  # Enable colors in color-supporting terminals
+  ui = auto
 [alias]
   # List available aliases
   aliases = !git config --get-regexp alias | sed -re 's/alias\\.(\\S*)\\s(.*)$/\\1 = \\2/g'
@@ -33,53 +33,53 @@
   # Remove file(s) from Git but not from disk
   untrack = rm --cache --
 [core]
-	# Don't paginate output by default
-	pager = cat
+  # Don't paginate output by default
+  pager = cat
   # Global ignore file (not shared)
   excludesfile = ~/.gitignore_global
   # Global shared hooks directory
   # hooksPath = ~/.githooks
-	#
-	# Out of luck: on Windows w/o msysGit? You may have Notepad++…
-	# editor = 'C:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin
-	# 
-	# If you want to use Sublime Text 2's subl wrapper:
-	# editor = subl -w
-	# 
-	# Sublime Text 3 on Windows:
-	# editor = 'c:/Program Files/Sublime Text 3/subl.exe' -w
+  #
+  # Out of luck: on Windows w/o msysGit? You may have Notepad++…
+  # editor = 'C:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin
+  # 
+  # If you want to use Sublime Text 2's subl wrapper:
+  # editor = subl -w
+  # 
+  # Sublime Text 3 on Windows:
+  # editor = 'c:/Program Files/Sublime Text 3/subl.exe' -w
   #
   # VSCode
   editor = code --wait
-	# Don't consider trailing space change as a cause for merge conflicts
-	whitespace = -trailing-space
+  # Don't consider trailing space change as a cause for merge conflicts
+  whitespace = -trailing-space
 [diff]
-	# Use better, descriptive initials (c, i, w) instead of a/b.
-	mnemonicPrefix = true
-	# Show renames/moves as such
-	renames = true
-	# When using --word-diff, assume --word-diff-regex=.
-	wordRegex = .
-	# Display submodule-related information (commit listings)
-	submodule = log
+  # Use better, descriptive initials (c, i, w) instead of a/b.
+  mnemonicPrefix = true
+  # Show renames/moves as such
+  renames = true
+  # When using --word-diff, assume --word-diff-regex=.
+  wordRegex = .
+  # Display submodule-related information (commit listings)
+  submodule = log
   # Use VSCode as default diff tool when running `git diff-tool`
   tool = vscode
 [difftool "vscode"]
   cmd = code --wait --diff $LOCAL $REMOTE
 [fetch]
-	# Auto-fetch submodule changes (sadly, won't auto-update)
-	recurseSubmodules = on-demand
+  # Auto-fetch submodule changes (sadly, won't auto-update)
+  recurseSubmodules = on-demand
 [grep]
   break = true
   heading = true
   lineNumber = true
-	# Consider most regexes to be ERE
-	extendedRegexp = true
+  # Consider most regexes to be ERE
+  extendedRegexp = true
 [log]
-	# Use abbrev SHAs whenever possible/relevant instead of full 40 chars
-	abbrevCommit = true
-	# Automatically --follow when given a single path
-	follow = true
+  # Use abbrev SHAs whenever possible/relevant instead of full 40 chars
+  abbrevCommit = true
+  # Automatically --follow when given a single path
+  follow = true
   # Disable decorate for reflog
   # (because there is no dedicated `reflog` section available)
   decorate = false
@@ -98,31 +98,31 @@
   # name = automatically merge npm lockfiles
   # driver = npx npm-merge-driver merge %A %O %B %P
 [mergetool]
-	# Clean up backup files created by merge tools on tool exit
-	keepBackup = false
-	# Clean up temp files created by merge tools on tool exit
-	keepTemporaries = false
-	# Put the temp files in a dedicated dir anyway
-	writeToTemp = true
-	# Auto-accept file prompts when launching merge tools
-	prompt = false
+  # Clean up backup files created by merge tools on tool exit
+  keepBackup = false
+  # Clean up temp files created by merge tools on tool exit
+  keepTemporaries = false
+  # Put the temp files in a dedicated dir anyway
+  writeToTemp = true
+  # Auto-accept file prompts when launching merge tools
+  prompt = false
 # [page]
   # Use custom pager to get an better log on terminal.
   # As this is an external tool it has to be installed.
   # See https://github.com/so-fancy/diff-so-fancy
   # show = diff-so-fancy | less --tabs=4 -RFX
 [pull]
-	# This is GREAT… when you know what you're doing and are careful
-	# not to pull --no-rebase over a local line containing a true merge.
-	# rebase = true
-	# WARNING! This option, which does away with the one gotcha of
-	# auto-rebasing on pulls, is only available from 1.8.5 onwards.
-	rebase = preserve
+  # This is GREAT… when you know what you're doing and are careful
+  # not to pull --no-rebase over a local line containing a true merge.
+  # rebase = true
+  # WARNING! This option, which does away with the one gotcha of
+  # auto-rebasing on pulls, is only available from 1.8.5 onwards.
+  rebase = preserve
 [push]
-	# Default push should only push the current branch to its push target, regardless of its remote name
-	default = upstream
-	# When pushing, also push tags whose commit-ishs are now reachable upstream
-	followTags = true
+  # Default push should only push the current branch to its push target, regardless of its remote name
+  default = upstream
+  # When pushing, also push tags whose commit-ishs are now reachable upstream
+  followTags = true
 # [rebase]
   # Rebase advanced usage.
   # Automagically reorder and prefix your commands while doing an interactive
@@ -134,24 +134,24 @@
   # after and before your rebase.
   # autoStash = true
 # [rerere]
-	# If, like me, you like rerere, uncomment these
-	# autoupdate = true
-	# enabled = true
+  # If, like me, you like rerere, uncomment these
+  # autoupdate = true
+  # enabled = true
 [status]
-	# Display submodule rev change summaries in status
-	submoduleSummary = true
-	# Recursively traverse untracked directories to display all contents
-	showUntrackedFiles = all
+  # Display submodule rev change summaries in status
+  submoduleSummary = true
+  # Recursively traverse untracked directories to display all contents
+  showUntrackedFiles = all
 [color "branch"]
-	# Blue on black is hard to read in git branch -vv: use cyan instead
-	upstream = cyan
+  # Blue on black is hard to read in git branch -vv: use cyan instead
+  upstream = cyan
 [tag]
-	# Sort tags as version numbers whenever applicable, so 1.10.2 is AFTER 1.2.0.
-	sort = version:refname
+  # Sort tags as version numbers whenever applicable, so 1.10.2 is AFTER 1.2.0.
+  sort = version:refname
 [versionsort]
-	prereleaseSuffix = -pre
-	prereleaseSuffix = .pre
-	prereleaseSuffix = -beta
-	prereleaseSuffix = .beta
-	prereleaseSuffix = -rc
-	prereleaseSuffix = .rc
+  prereleaseSuffix = -pre
+  prereleaseSuffix = .pre
+  prereleaseSuffix = -beta
+  prereleaseSuffix = .beta
+  prereleaseSuffix = -rc
+  prereleaseSuffix = .rc
diff --git a/gitconfig.ini b/gitconfig.ini
@@ -7,32 +7,50 @@
 	# Enable colors in color-supporting terminals
 	ui = auto
 [alias]
-	st = status
-	ci = commit
-	lg = log --graph --date=relative --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ad)%Creset'
-	oops = commit --amend --no-edit
-	review-local = "!git lg @{push}.."
-	# Or pre 2.5, as we didn't differential push and upstream in shorthands:
-	# review-local = lg @{upstream}..
+  # List available aliases
+  aliases = !git config --get-regexp alias | sed -re 's/alias\\.(\\S*)\\s(.*)$/\\1 = \\2/g'
+  # Command shortcuts
+  ci = commit
+  co = checkout
+  st = status
+  # Display tree-like log, because default log is a pain…
+  lg = log --graph --date=relative --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ad)%Creset'
+  # Useful when you have to update your last commit
+  # with staged files without editing the commit message.
+  oops = commit --amend --no-edit
+  # Ensure that force-pushing won't lose someone else's work (only mine).
+  push-with-lease = push --force-with-lease
+  # Rebase won’t trigger hooks on each "replayed" commit.
+  # This is an ugly hack that will replay each commit during rebase with the
+  # standard `commit` command which will trigger hooks.
+  rebase-with-hooks = rebase -x 'git reset --soft HEAD~1 && git commit -C HEAD@{1}'
+  # List local commits that were not pushed to remote repository
+  review-local = "!git lg @{push}.."
+  # Edit last commit message
+  reword = commit --amend
+  # Undo last commit but keep changed files in stage
+  uncommit = reset --soft HEAD~1
+  # Remove file(s) from Git but not from disk
+  untrack = rm --cache --
 [core]
 	# Don't paginate output by default
 	pager = cat
+  # Global ignore file (not shared)
+  excludesfile = ~/.gitignore_global
+  # Global shared hooks directory
+  # hooksPath = ~/.githooks
 	#
 	# Out of luck: on Windows w/o msysGit? You may have Notepad++…
 	# editor = 'C:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin
 	# 
 	# If you want to use Sublime Text 2's subl wrapper:
 	# editor = subl -w
 	# 
-	# Or Atom, perhaps:
-	# editor = atom --wait
-	# 
-	# Sublime Text 2 on Windows:
-	# editor = 'c:/Program Files (x86)/Sublime Text 2/sublime_text.exe' -w
-	# 
 	# Sublime Text 3 on Windows:
 	# editor = 'c:/Program Files/Sublime Text 3/subl.exe' -w
-	#
+  #
+  # VSCode
+  editor = code --wait
 	# Don't consider trailing space change as a cause for merge conflicts
 	whitespace = -trailing-space
 [diff]
@@ -44,20 +62,41 @@
 	wordRegex = .
 	# Display submodule-related information (commit listings)
 	submodule = log
+  # Use VSCode as default diff tool when running `git diff-tool`
+  tool = vscode
+[difftool "vscode"]
+  cmd = code --wait --diff $LOCAL $REMOTE
 [fetch]
 	# Auto-fetch submodule changes (sadly, won't auto-update)
 	recurseSubmodules = on-demand
 [grep]
+  break = true
+  heading = true
+  lineNumber = true
 	# Consider most regexes to be ERE
 	extendedRegexp = true
 [log]
 	# Use abbrev SHAs whenever possible/relevant instead of full 40 chars
 	abbrevCommit = true
 	# Automatically --follow when given a single path
 	follow = true
+  # Disable decorate for reflog
+  # (because there is no dedicated `reflog` section available)
+  decorate = false
 [merge]
-	# Display common-ancestor blocks in conflict hunks
-	conflictStyle = diff3
+  # Display common-ancestor blocks in conflict hunks
+  # conflictStyle = diff3
+  # Disable fast-forward merges as default merge strategy.
+  # Force explicit call of `git merge --ff …`.
+  ff = false
+  # Custom/dedicated merge drive for npm lock files (`package-lock.json`).
+  # Also works with Yarn.
+  # Use Git attributes to set targeted files (located at `~/.config/git/attributes``
+  # when installed with npm).
+  # See https://www.npmjs.com/package/npm-merge-driver
+  # [merge "npm-merge-driver"]
+  # name = automatically merge npm lockfiles
+  # driver = npx npm-merge-driver merge %A %O %B %P
 [mergetool]
 	# Clean up backup files created by merge tools on tool exit
 	keepBackup = false
@@ -67,6 +106,11 @@
 	writeToTemp = true
 	# Auto-accept file prompts when launching merge tools
 	prompt = false
+# [page]
+  # Use custom pager to get an better log on terminal.
+  # As this is an external tool it has to be installed.
+  # See https://github.com/so-fancy/diff-so-fancy
+  # show = diff-so-fancy | less --tabs=4 -RFX
 [pull]
 	# This is GREAT… when you know what you're doing and are careful
 	# not to pull --no-rebase over a local line containing a true merge.
@@ -79,7 +123,17 @@
 	default = upstream
 	# When pushing, also push tags whose commit-ishs are now reachable upstream
 	followTags = true
-[rerere]
+# [rebase]
+  # Rebase advanced usage.
+  # Automagically reorder and prefix your commands while doing an interactive
+  # rebase. This has to be used with `--fixup` and/or `--squash` options for
+  # `git commit`.
+  # autoSquash = true
+  # Automatically stash current WD and stage when running rebase
+  # then you won't have to manually `git stash push` and `git stash pop`
+  # after and before your rebase.
+  # autoStash = true
+# [rerere]
 	# If, like me, you like rerere, uncomment these
 	# autoupdate = true
 	# enabled = true

diff --git a/gitconfig.ini b/gitconfig.ini
@@ -11,7 +11,7 @@
 	ci = commit
 	lg = log --graph --date=relative --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ad)%Creset'
 	oops = commit --amend --no-edit
-	review-local = lg @{push}..
+	review-local = "!git lg @{push}.."
 	# Or pre 2.5, as we didn't differential push and upstream in shorthands:
 	# review-local = lg @{upstream}..
 [core]

diff --git a/gitconfig.ini b/gitconfig.ini
@@ -9,7 +9,7 @@
 [alias]
 	st = status
 	ci = commit
-	lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ar)%Creset'
+	lg = log --graph --date=relative --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ad)%Creset'
 	oops = commit --amend --no-edit
 	review-local = lg @{push}..
 	# Or pre 2.5, as we didn't differential push and upstream in shorthands:

diff --git a/gitconfig.ini b/gitconfig.ini
@@ -13,7 +13,7 @@
 	oops = commit --amend --no-edit
 	review-local = lg @{push}..
 	# Or pre 2.5, as we didn't differential push and upstream in shorthands:
-	review-local = lg @{upstream}..
+	# review-local = lg @{upstream}..
 [core]
 	# Don't paginate output by default
 	pager = cat

diff --git a/gitconfig.ini b/gitconfig.ini
@@ -11,12 +11,15 @@
 	ci = commit
 	lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ar)%Creset'
 	oops = commit --amend --no-edit
+	review-local = lg @{push}..
+	# Or pre 2.5, as we didn't differential push and upstream in shorthands:
+	review-local = lg @{upstream}..
 [core]
 	# Don't paginate output by default
 	pager = cat
 	#
 	# Out of luck: on Windows w/o msysGit? You may have Notepad++…
-	# editor = 'C:/Program Files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin
+	# editor = 'C:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin
 	# 
 	# If you want to use Sublime Text 2's subl wrapper:
 	# editor = subl -w
@@ -25,10 +28,10 @@
 	# editor = atom --wait
 	# 
 	# Sublime Text 2 on Windows:
-	# editor = "'c:/program files/sublime text 2/sublime_text.exe' -w"
+	# editor = 'c:/Program Files (x86)/Sublime Text 2/sublime_text.exe' -w
 	# 
 	# Sublime Text 3 on Windows:
-	# editor = "'c:/program files/sublime text 3/subl.exe' -w"
+	# editor = 'c:/Program Files/Sublime Text 3/subl.exe' -w
 	#
 	# Don't consider trailing space change as a cause for merge conflicts
 	whitespace = -trailing-space
@@ -50,6 +53,8 @@
 [log]
 	# Use abbrev SHAs whenever possible/relevant instead of full 40 chars
 	abbrevCommit = true
+	# Automatically --follow when given a single path
+	follow = true
 [merge]
 	# Display common-ancestor blocks in conflict hunks
 	conflictStyle = diff3
@@ -58,6 +63,8 @@
 	keepBackup = false
 	# Clean up temp files created by merge tools on tool exit
 	keepTemporaries = false
+	# Put the temp files in a dedicated dir anyway
+	writeToTemp = true
 	# Auto-accept file prompts when launching merge tools
 	prompt = false
 [pull]
@@ -86,4 +93,11 @@
 	upstream = cyan
 [tag]
 	# Sort tags as version numbers whenever applicable, so 1.10.2 is AFTER 1.2.0.
-	sort = version:refname
+	sort = version:refname
+[versionsort]
+	prereleaseSuffix = -pre
+	prereleaseSuffix = .pre
+	prereleaseSuffix = -beta
+	prereleaseSuffix = .beta
+	prereleaseSuffix = -rc
+	prereleaseSuffix = .rc
diff --git a/gitconfig.ini b/gitconfig.ini
@@ -4,13 +4,15 @@
 	name = Your Full Name
 	email = [email protected]
 [color]
+	# Enable colors in color-supporting terminals
 	ui = auto
 [alias]
 	st = status
 	ci = commit
 	lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ar)%Creset'
 	oops = commit --amend --no-edit
 [core]
+	# Don't paginate output by default
 	pager = cat
 	#
 	# Out of luck: on Windows w/o msysGit? You may have Notepad++…
@@ -28,23 +30,35 @@
 	# Sublime Text 3 on Windows:
 	# editor = "'c:/program files/sublime text 3/subl.exe' -w"
 	#
+	# Don't consider trailing space change as a cause for merge conflicts
 	whitespace = -trailing-space
 [diff]
+	# Use better, descriptive initials (c, i, w) instead of a/b.
 	mnemonicPrefix = true
+	# Show renames/moves as such
 	renames = true
+	# When using --word-diff, assume --word-diff-regex=.
 	wordRegex = .
+	# Display submodule-related information (commit listings)
 	submodule = log
 [fetch]
+	# Auto-fetch submodule changes (sadly, won't auto-update)
 	recurseSubmodules = on-demand
 [grep]
+	# Consider most regexes to be ERE
 	extendedRegexp = true
 [log]
+	# Use abbrev SHAs whenever possible/relevant instead of full 40 chars
 	abbrevCommit = true
 [merge]
+	# Display common-ancestor blocks in conflict hunks
 	conflictStyle = diff3
 [mergetool]
+	# Clean up backup files created by merge tools on tool exit
 	keepBackup = false
+	# Clean up temp files created by merge tools on tool exit
 	keepTemporaries = false
+	# Auto-accept file prompts when launching merge tools
 	prompt = false
 [pull]
 	# This is GREAT… when you know what you're doing and are careful
@@ -54,15 +68,22 @@
 	# auto-rebasing on pulls, is only available from 1.8.5 onwards.
 	rebase = preserve
 [push]
+	# Default push should only push the current branch to its push target, regardless of its remote name
 	default = upstream
+	# When pushing, also push tags whose commit-ishs are now reachable upstream
+	followTags = true
 [rerere]
 	# If, like me, you like rerere, uncomment these
 	# autoupdate = true
 	# enabled = true
 [status]
+	# Display submodule rev change summaries in status
 	submoduleSummary = true
+	# Recursively traverse untracked directories to display all contents
 	showUntrackedFiles = all
 [color "branch"]
+	# Blue on black is hard to read in git branch -vv: use cyan instead
 	upstream = cyan
 [tag]
+	# Sort tags as version numbers whenever applicable, so 1.10.2 is AFTER 1.2.0.
 	sort = version:refname
diff --git a/gitconfig.ini b/gitconfig.ini
@@ -1,4 +1,5 @@
-# A mettre dans ~/.gitconfig ou ~/.config/git/config
+# Put this in your ~/.gitconfig or ~/.config/git/config
+# Windows users: "~" is your profile's home directory, e.g. C:\Users\<YourName>
 [user]
 	name = Your Full Name
 	email = [email protected]

diff --git a/gitconfig → gitconfig.ini b/gitconfig → gitconfig.ini
diff --git a/Config Git globale qui va bien → gitconfig b/Config Git globale qui va bien → gitconfig
diff --git a/Config Git globale qui va bien b/Config Git globale qui va bien
@@ -1,7 +1,7 @@
-# À mettre dans ~/.gitconfig ou ~/.config/git/config
-	[user]
-	name = Ton Nom
-	email = ton@email.tld
+# A mettre dans ~/.gitconfig ou ~/.config/git/config
+[user]
+	name = Your Full Name
+	email = your@email.tld
 [color]
 	ui = auto
 [alias]
@@ -18,6 +18,15 @@
 	# If you want to use Sublime Text 2's subl wrapper:
 	# editor = subl -w
 	# 
+	# Or Atom, perhaps:
+	# editor = atom --wait
+	# 
+	# Sublime Text 2 on Windows:
+	# editor = "'c:/program files/sublime text 2/sublime_text.exe' -w"
+	# 
+	# Sublime Text 3 on Windows:
+	# editor = "'c:/program files/sublime text 3/subl.exe' -w"
+	#
 	whitespace = -trailing-space
 [diff]
 	mnemonicPrefix = true
@@ -55,4 +64,4 @@
 [color "branch"]
 	upstream = cyan
 [tag]
-	sort = version:refname
+	sort = version:refname
diff --git a/Config Git globale qui va bien b/Config Git globale qui va bien
@@ -46,7 +46,7 @@
 [push]
 	default = upstream
 [rerere]
-	# If, like me, you like rerere, decomment these
+	# If, like me, you like rerere, uncomment these
 	# autoupdate = true
 	# enabled = true
 [status]

diff --git a/Config Git globale qui va bien b/Config Git globale qui va bien
@@ -23,6 +23,7 @@
 	mnemonicPrefix = true
 	renames = true
 	wordRegex = .
+	submodule = log
 [fetch]
 	recurseSubmodules = on-demand
 [grep]

diff --git a/Config Git globale qui va bien b/Config Git globale qui va bien
@@ -1,58 +1,57 @@
 # À mettre dans ~/.gitconfig ou ~/.config/git/config
-
-[user]
-  name = Ton Nom
-  email = [email protected]
+	[user]
+	name = Ton Nom
+	email = [email protected]
 [color]
-  ui = auto
+	ui = auto
 [alias]
-  st = status
-  ci = commit
-  lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ar)%Creset'
-  oops = commit --amend --no-edit
+	st = status
+	ci = commit
+	lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ar)%Creset'
+	oops = commit --amend --no-edit
 [core]
-  pager = cat
-  #
-  # Out of luck: on Windows w/o msysGit? You may have Notepad++…
-  # editor = 'C:/Program Files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin
-  # 
-  # If you want to use Sublime Text 2's subl wrapper:
-  # editor = subl -w
-  # 
-  whitespace = -trailing-space
+	pager = cat
+	#
+	# Out of luck: on Windows w/o msysGit? You may have Notepad++…
+	# editor = 'C:/Program Files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin
+	# 
+	# If you want to use Sublime Text 2's subl wrapper:
+	# editor = subl -w
+	# 
+	whitespace = -trailing-space
 [diff]
-  mnemonicPrefix = true
-  renames = true
-  wordRegex = .
+	mnemonicPrefix = true
+	renames = true
+	wordRegex = .
 [fetch]
-  recurseSubmodules = on-demand
+	recurseSubmodules = on-demand
 [grep]
-  extendedRegexp = true
+	extendedRegexp = true
 [log]
-  abbrevCommit = true
+	abbrevCommit = true
 [merge]
-  conflictStyle = diff3
+	conflictStyle = diff3
 [mergetool]
-  keepBackup = false
-  keepTemporaries = false
-  prompt = false
+	keepBackup = false
+	keepTemporaries = false
+	prompt = false
 [pull]
-  # This is GREAT… when you know what you're doing and are careful
-  # not to pull --no-rebase over a local line containing a true merge.
-  # rebase = true
-  # WARNING! This option, which does away with the one gotcha of
-  # auto-rebasing on pulls, is only available from 1.8.5 onwards.
-  rebase = preserve
+	# This is GREAT… when you know what you're doing and are careful
+	# not to pull --no-rebase over a local line containing a true merge.
+	# rebase = true
+	# WARNING! This option, which does away with the one gotcha of
+	# auto-rebasing on pulls, is only available from 1.8.5 onwards.
+	rebase = preserve
 [push]
-  default = upstream
+	default = upstream
 [rerere]
-  # If, like me, you like rerere, decomment these
-  # autoupdate = true
-  # enabled = true
+	# If, like me, you like rerere, decomment these
+	# autoupdate = true
+	# enabled = true
 [status]
-  submoduleSummary = true
-  showUntrackedFiles = all
+	submoduleSummary = true
+	showUntrackedFiles = all
 [color "branch"]
-  upstream = cyan
+	upstream = cyan
 [tag]
-  sort = version:refname
+	sort = version:refname
diff --git a/Config Git globale qui va bien b/Config Git globale qui va bien
@@ -1,50 +1,58 @@
+# À mettre dans ~/.gitconfig ou ~/.config/git/config
+
 [user]
-	name = Ton Nom
-	email = [email protected]
+  name = Ton Nom
+  email = [email protected]
 [color]
-	ui = auto
+  ui = auto
 [alias]
-	st = status
-	ci = commit
-	lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ar)%Creset'
+  st = status
+  ci = commit
+  lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ar)%Creset'
+  oops = commit --amend --no-edit
 [core]
-	pager = cat
-        #
-        # Out of luck: on Windows w/o msysGit? You may have Notepad++…
-        # editor = 'C:/Program Files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin
-        # 
-        # If you want to use Sublime Text 2's subl wrapper:
-        # editor = subl -w
-        # 
-        whitespace = -trailing-space
+  pager = cat
+  #
+  # Out of luck: on Windows w/o msysGit? You may have Notepad++…
+  # editor = 'C:/Program Files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin
+  # 
+  # If you want to use Sublime Text 2's subl wrapper:
+  # editor = subl -w
+  # 
+  whitespace = -trailing-space
 [diff]
-        mnemonicPrefix = true
-        wordRegex = .
+  mnemonicPrefix = true
+  renames = true
+  wordRegex = .
 [fetch]
-        recurseSubmodules = on-demand
+  recurseSubmodules = on-demand
 [grep]
-        extendedRegexp = true
+  extendedRegexp = true
 [log]
-        abbrevCommit = true
+  abbrevCommit = true
 [merge]
-        conflictStyle = diff3
+  conflictStyle = diff3
 [mergetool]
-        keepBackup = false
-        keepTemporaries = false
-        prompt = false
+  keepBackup = false
+  keepTemporaries = false
+  prompt = false
 [pull]
-        # This is GREAT… when you know what you're doing and are careful
-        # not to pull --no-rebase over a local line containing a true merge.
-        # rebase = true
-        # WARNING! This option, which does away with the one gotcha of
-        # auto-rebasing on pulls, is only available from 1.8.5 onwards.
-        rebase = preserve
+  # This is GREAT… when you know what you're doing and are careful
+  # not to pull --no-rebase over a local line containing a true merge.
+  # rebase = true
+  # WARNING! This option, which does away with the one gotcha of
+  # auto-rebasing on pulls, is only available from 1.8.5 onwards.
+  rebase = preserve
 [push]
-        default = upstream
+  default = upstream
 [rerere]
-        # If, like me, you like rerere, decomment these
-        # autoupdate = true
-        # enabled = true
+  # If, like me, you like rerere, decomment these
+  # autoupdate = true
+  # enabled = true
 [status]
-        submoduleSummary = true
-        showUntrackedFiles = all
+  submoduleSummary = true
+  showUntrackedFiles = all
+[color "branch"]
+  upstream = cyan
+[tag]
+  sort = version:refname
diff --git a/Config Git globale qui va bien b/Config Git globale qui va bien
@@ -46,4 +46,5 @@
         # autoupdate = true
         # enabled = true
 [status]
-        submoduleSummary = true
+        submoduleSummary = true
+        showUntrackedFiles = all
diff --git a/Config Git globale qui va bien b/Config Git globale qui va bien
@@ -37,7 +37,7 @@
         # not to pull --no-rebase over a local line containing a true merge.
         # rebase = true
         # WARNING! This option, which does away with the one gotcha of
-        # auto-rebasing on pulls, is only available from 1.9.0 onwards.
+        # auto-rebasing on pulls, is only available from 1.8.5 onwards.
         rebase = preserve
 [push]
         default = upstream

diff --git a/Config Git globale qui va bien b/Config Git globale qui va bien
@@ -36,6 +36,9 @@
         # This is GREAT… when you know what you're doing and are careful
         # not to pull --no-rebase over a local line containing a true merge.
         # rebase = true
+        # WARNING! This option, which does away with the one gotcha of
+        # auto-rebasing on pulls, is only available from 1.9.0 onwards.
+        rebase = preserve
 [push]
         default = upstream
 [rerere]

diff --git a/Config Git globale qui va bien b/Config Git globale qui va bien
@@ -6,7 +6,7 @@
 [alias]
 	st = status
 	ci = commit
-	lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%an %cr)%Creset'
+	lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ar)%Creset'
 [core]
 	pager = cat
         #

diff --git a/Config Git globale qui va bien b/Config Git globale qui va bien
@@ -33,7 +33,9 @@
         keepTemporaries = false
         prompt = false
 [pull]
-        rebase = true
+        # This is GREAT… when you know what you're doing and are careful
+        # not to pull --no-rebase over a local line containing a true merge.
+        # rebase = true
 [push]
         default = upstream
 [rerere]

diff --git a/Config Git globale qui va bien b/Config Git globale qui va bien
@@ -9,10 +9,13 @@
 	lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%an %cr)%Creset'
 [core]
 	pager = cat
-        # Pas de bol et sous Windows sans msysGit ? Supposons que tu as tout de même Notepad++…
+        #
+        # Out of luck: on Windows w/o msysGit? You may have Notepad++…
         # editor = 'C:/Program Files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin
+        # 
         # If you want to use Sublime Text 2's subl wrapper:
         # editor = subl -w
+        # 
         whitespace = -trailing-space
 [diff]
         mnemonicPrefix = true
@@ -33,5 +36,9 @@
         rebase = true
 [push]
         default = upstream
+[rerere]
+        # If, like me, you like rerere, decomment these
+        # autoupdate = true
+        # enabled = true
 [status]
         submoduleSummary = true
diff --git a/Config Git globale qui va bien b/Config Git globale qui va bien
@@ -15,6 +15,7 @@
         # editor = subl -w
         whitespace = -trailing-space
 [diff]
+        mnemonicPrefix = true
         wordRegex = .
 [fetch]
         recurseSubmodules = on-demand

diff --git a/Config Git globale qui va bien b/Config Git globale qui va bien
@@ -9,7 +9,7 @@
 	lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%an %cr)%Creset'
 [core]
 	pager = cat
-        # Pas de bol et sous Windows ? Supposons que tu as tout de même Notepad++…
+        # Pas de bol et sous Windows sans msysGit ? Supposons que tu as tout de même Notepad++…
         # editor = 'C:/Program Files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin
         # If you want to use Sublime Text 2's subl wrapper:
         # editor = subl -w

diff --git a/Config Git globale qui va bien b/Config Git globale qui va bien
@@ -12,7 +12,7 @@
         # Pas de bol et sous Windows ? Supposons que tu as tout de même Notepad++…
         # editor = 'C:/Program Files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin
         # If you want to use Sublime Text 2's subl wrapper:
-        # editor = 'subl -w'
+        # editor = subl -w
         whitespace = -trailing-space
 [diff]
         wordRegex = .

diff --git a/Config Git globale qui va bien b/Config Git globale qui va bien
@@ -2,16 +2,35 @@
 	name = Ton Nom
 	email = [email protected]
 [color]
-	diff = auto
-	status = auto
-	branch = auto
+	ui = auto
 [alias]
 	st = status
 	ci = commit
-	co = checkout
-	fp = format-patch
-	lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%an %cr)%Creset' --abbrev-commit --date=relative
+	lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%an %cr)%Creset'
 [core]
 	pager = cat
-# Pas de bol et sous Windows ? Supposons que tu as tout de même Notepad++…
-#       editor = 'C:/Program Files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin
+        # Pas de bol et sous Windows ? Supposons que tu as tout de même Notepad++…
+        # editor = 'C:/Program Files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin
+        # If you want to use Sublime Text 2's subl wrapper:
+        # editor = 'subl -w'
+        whitespace = -trailing-space
+[diff]
+        wordRegex = .
+[fetch]
+        recurseSubmodules = on-demand
+[grep]
+        extendedRegexp = true
+[log]
+        abbrevCommit = true
+[merge]
+        conflictStyle = diff3
+[mergetool]
+        keepBackup = false
+        keepTemporaries = false
+        prompt = false
+[pull]
+        rebase = true
+[push]
+        default = upstream
+[status]
+        submoduleSummary = true
diff --git a/Config Git globale qui va bien b/Config Git globale qui va bien
@@ -12,4 +12,6 @@
 	fp = format-patch
 	lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%an %cr)%Creset' --abbrev-commit --date=relative
 [core]
-	pager = cat
+	pager = cat
+# Pas de bol et sous Windows ? Supposons que tu as tout de même Notepad++…
+#       editor = 'C:/Program Files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin
diff --git a/Config Git globale qui va bien b/Config Git globale qui va bien
@@ -0,0 +1,15 @@
+[user]
+	name = Ton Nom
+	email = [email protected]
+[color]
+	diff = auto
+	status = auto
+	branch = auto
+[alias]
+	st = status
+	ci = commit
+	co = checkout
+	fp = format-patch
+	lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%an %cr)%Creset' --abbrev-commit --date=relative
+[core]
+	pager = cat