How to do git tricks - Revision history

Jmandel: /* Filter */

2020-02-29T23:32:04Z

Filter

← Older revision		Revision as of 23:32, 29 February 2020
Line 97:		Line 97:
	* https://stackoverflow.com/questions/7430717/git-filter-branch-on-all-branches		* https://stackoverflow.com/questions/7430717/git-filter-branch-on-all-branches
	* https://git-scm.com/docs/git-filter-branch		* https://git-scm.com/docs/git-filter-branch
			* https://github.com/newren/git-filter-repo/

	===Filter subdirectory===		===Filter subdirectory===

2020-02-29T20:56:24Z

Compare and copy files from other branches

← Older revision		Revision as of 20:56, 29 February 2020
Line 14:		Line 14:

	==Compare and copy files from other branches==		==Compare and copy files from other branches==
	https://stackoverflow.com/questions/2364147/how-to-get-just-one-file-from-another-branch		* https://stackoverflow.com/questions/2364147/how-to-get-just-one-file-from-another-branch
			* https://stosb.com/blog/retaining-history-when-moving-files-across-repositories-in-git/

	==Include branches from an unrelated repository==		==Include branches from an unrelated repository==

2020-02-29T20:44:39Z

Filter

@@ Line 96: / Line 96: @@
 * https://stackoverflow.com/questions/7430717/git-filter-branch-on-all-branches
 * https://git-scm.com/docs/git-filter-branch
 ==Submodules==

2020-02-29T20:43:40Z

Rewriting history: -> Filter

← Older revision		Revision as of 20:43, 29 February 2020
Line 91:		Line 91:
	* https://stackoverflow.com/questions/6434995/how-to-re-merge-a-file-in-the-git		* https://stackoverflow.com/questions/6434995/how-to-re-merge-a-file-in-the-git

	==~~Rewriting history~~==		==Filter==
	* https://manishearth.github.io/blog/2017/03/05/understanding-git-filter-branch/		* https://manishearth.github.io/blog/2017/03/05/understanding-git-filter-branch/
	** to extract a subdirectory: git filter-branch --subdirectory-filter name_of_subdir @		** to extract a subdirectory: git filter-branch --subdirectory-filter name_of_subdir @

2019-05-08T08:33:05Z

See also

← Older revision		Revision as of 08:33, 8 May 2019
Line 105:		Line 105:
	* https://www.git-scm.com/docs/git-mergetool		* https://www.git-scm.com/docs/git-mergetool
	* [https://gist.github.com/karenyyng/f19ff75c60f18b4b8149#file-git_mergetool_tutorial-md git mergetool tutorial]		* [https://gist.github.com/karenyyng/f19ff75c60f18b4b8149#file-git_mergetool_tutorial-md git mergetool tutorial]
			* https://git-blame.blogspot.com/2013/09/fun-with-first-parent-history.html

2019-05-07T16:23:07Z

See also

← Older revision		Revision as of 16:23, 7 May 2019
Line 103:		Line 103:
	* [https://git-scm.com/docs/git-diff git diff man page]		* [https://git-scm.com/docs/git-diff git diff man page]
	* https://randyfay.com/content/avoiding-git-disasters-gory-story		* https://randyfay.com/content/avoiding-git-disasters-gory-story
			* https://www.git-scm.com/docs/git-mergetool
			* [https://gist.github.com/karenyyng/f19ff75c60f18b4b8149#file-git_mergetool_tutorial-md git mergetool tutorial]

2019-04-28T13:34:49Z

See also

← Older revision		Revision as of 13:34, 28 April 2019
Line 97:		Line 97:
	* https://git-scm.com/docs/git-filter-branch		* https://git-scm.com/docs/git-filter-branch

			==Submodules==
			* https://git-scm.com/book/en/v2/Git-Tools-Submodules
	==See also==		==See also==
	* [https://git-scm.com/docs/git-cherry-pick git cherry pick man page]		* [https://git-scm.com/docs/git-cherry-pick git cherry pick man page]
	* [https://git-scm.com/docs/git-diff git diff man page]		* [https://git-scm.com/docs/git-diff git diff man page]
	* https://randyfay.com/content/avoiding-git-disasters-gory-story		* https://randyfay.com/content/avoiding-git-disasters-gory-story

2019-04-28T07:11:23Z

See also

← Older revision		Revision as of 07:11, 28 April 2019
Line 100:		Line 100:
	* [https://git-scm.com/docs/git-cherry-pick git cherry pick man page]		* [https://git-scm.com/docs/git-cherry-pick git cherry pick man page]
	* [https://git-scm.com/docs/git-diff git diff man page]		* [https://git-scm.com/docs/git-diff git diff man page]
			* https://randyfay.com/content/avoiding-git-disasters-gory-story

2019-04-27T03:12:24Z

Rewriting history

← Older revision		Revision as of 03:12, 27 April 2019
Line 93:		Line 93:
	==Rewriting history==		==Rewriting history==
	* https://manishearth.github.io/blog/2017/03/05/understanding-git-filter-branch/		* https://manishearth.github.io/blog/2017/03/05/understanding-git-filter-branch/
	** extract a subdirectory		** to extract a subdirectory: git filter-branch --subdirectory-filter name_of_subdir @
	~~<pre>~~		* https://stackoverflow.com/questions/7430717/git-filter-branch-on-all-branches
	git filter-branch --subdirectory-filter name_of_subdir @		* https://git-scm.com/docs/git-filter-branch
	</~~pre>~~
	==See also==		==See also==
	* [https://git-scm.com/docs/git-cherry-pick git cherry pick man page]		* [https://git-scm.com/docs/git-cherry-pick git cherry pick man page]
	* [https://git-scm.com/docs/git-diff git diff man page]		* [https://git-scm.com/docs/git-diff git diff man page]

2019-04-26T17:56:39Z

See also

← Older revision		Revision as of 17:56, 26 April 2019
Line 91:		Line 91:
	* https://stackoverflow.com/questions/6434995/how-to-re-merge-a-file-in-the-git		* https://stackoverflow.com/questions/6434995/how-to-re-merge-a-file-in-the-git

			==Rewriting history==
			* https://manishearth.github.io/blog/2017/03/05/understanding-git-filter-branch/
			** extract a subdirectory
			<pre>
			git filter-branch --subdirectory-filter name_of_subdir @
			</pre>
	==See also==		==See also==
	* [https://git-scm.com/docs/git-cherry-pick git cherry pick man page]		* [https://git-scm.com/docs/git-cherry-pick git cherry pick man page]
	* [https://git-scm.com/docs/git-diff git diff man page]		* [https://git-scm.com/docs/git-diff git diff man page]