diff --git a/tutos/git.txt b/tutos/git.txt index beffb85..6c58744 100644 --- a/tutos/git.txt +++ b/tutos/git.txt @@ -38,6 +38,7 @@ **git cherry-pick NAME_OF_BRANCH** it merge a branch into the actual one, but only with the last commit **git --squash** https://stackoverflow.com/questions/23616706/git-squash-and-merge **git log --graph** show the graph of the commits with branchs +**git log --graph --date-order** show the graph with the commit in the chronological order **git log --first-parent master** show all the commits directly on master (or other branch) **relier dossier sur serveur en local avec git** **acceder au serveur via ssh :** diff --git a/tutos/vim.txt b/tutos/vim.txt index 32695e6..268cf94 100644 --- a/tutos/vim.txt +++ b/tutos/vim.txt @@ -138,6 +138,12 @@ **=G** rétablit la bonne indentation pour toute la page **''** go to last cursor position **gx** open the file under cursor, or url or links +**g ctrl a** increment a column of numbers : + - create a column of "0" + - then select them in visual block **ctrl v arrow** + - then hit **g ctrl a** + - or **g ctrl a a** if using screen + - **ctrl a** is a vim feature to increase a number /REMPLACER/ **:s/old/new** remplace la 1ere occurence de ancien par nouveau