User Tools

Site Tools


project_management:git

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
project_management:git [2010/08/20 20:45]
aorth
project_management:git [2010/11/21 13:16] (current)
aorth
Line 92: Line 92:
   - After you’ve committed the fixed version, do git rebase --continue   - After you’ve committed the fixed version, do git rebase --continue
  
 +===== Change the last commit'​s author =====
 +Sometimes you commit something without realizing you haven'​t properly configured your //​~/​.gitconfig//​. ​ Simple amend the last commit:
 +<​code>​$ git log -n1
 +commit 85f761ec52e4be90acd2dc7c9f5842e36ad7d783
 +Author: Alan Orth <​aorth@debian.example.org>​
 +Date:   Sun Nov 21 05:07:48 2010 -0500
 +
 +    Initial Import of DSpace 1.6.2
 +$ git commit --amend --author 'Alan Orth <​a.orth@cgiar.org>'​
 +... vim/nano will pop up, save the commit
 +$ git log -n1
 +commit 85f761ec52e4be90acd2dc7c9f5842e36ad7d783
 +Author: Alan Orth <​a.orth@cgiar.org>​
 +Date:   Sun Nov 21 05:07:48 2010 -0500
 +
 +    Initial Import of DSpace 1.6.2</​code>​
 ===== Assume file unchanged ===== ===== Assume file unchanged =====
 Certain files, like database configuration files, need to be tracked but you don't want to push changes to the remote repo.  This is different than using a ''​.gitignore''​ file, as //those files are not tracked in the repository//​! ​ This allows you to have a generic database config in your repository without telling everyone your database password! Certain files, like database configuration files, need to be tracked but you don't want to push changes to the remote repo.  This is different than using a ''​.gitignore''​ file, as //those files are not tracked in the repository//​! ​ This allows you to have a generic database config in your repository without telling everyone your database password!
project_management/git.txt · Last modified: 2010/11/21 13:16 by aorth