Public Git Hosting - git/jnareb-git.git/search

2010-08-18	Jonathan Nieder	merge script: learn --[no-]rerere-autoupdate Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-08-18	Jonathan Nieder	merge script: notice @{-1} shorthand Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-08-18	Jonathan Nieder	merge script: handle --no-ff --no-commit correctly Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-08-18	Jonathan Nieder	merge script: --ff-only to disallow true merge Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-08-18	Jonathan Nieder	merge script: handle many-way octopus Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-08-18	Jonathan Nieder	merge script: handle -m --log correctly Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-08-18	Jonathan Nieder	merge script: forbid merge -s index Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-08-18	Jonathan Nieder	merge script: allow custom strategies Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-08-18	Jonathan Nieder	merge script: merge -X<option> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-08-18	Jonathan Nieder	merge script: improve log message subject Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-08-18	Jonathan Nieder	merge script: refuse to merge during merge Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-08-18	Jonathan Nieder	merge script: tweak unmerged files message to match... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-08-18	Jonathan Nieder	merge script: --squash, --ff from unborn branch are... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-08-18	Jonathan Nieder	fmt-merge-msg -m to override merge title Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-08-18	Jonathan Nieder	merge-base --independent to print reduced parent list... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-08-18	Jonathan Nieder	merge-base --octopus to mimic show-branch --merge-base Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-08-18	Jonathan Nieder	Documentation: add a SEE ALSO section for merge-base Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-08-18	Jonathan Nieder	t6200 (fmt-merge-msg): style nitpicks Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-08-18	Jonathan Nieder	t6010 (merge-base): modernize style Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-08-18	Jonathan Nieder	t7600 (merge): test merge from branch yet to be born Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-08-18	Jonathan Nieder	t7600 (merge): check reflog entry Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-08-18	Jonathan Nieder	t7600 (merge): do not launch gitk for --debug Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-08-18	Jonathan Nieder	t7600 (merge): modernize style Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-08-18	Jonathan Nieder	merge: do not mistake (ancestor of) tag for branch Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-07-21	Jonathan Nieder	t/README: correct an exception when breaking a && chain...	commit \| commitdiff \| tree
2010-07-16	Jonathan Nieder	Add a sample user for the svndump library Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-07-15	Jonathan Nieder	Documentation: add submodule.* to the big configuration... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-07-15	Jonathan Nieder	gitmodules.5: url can be a relative path Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-07-14	Jonathan Nieder	git --paginate: paginate external commands again Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-07-12	Jonathan Nieder	t3000 (ls-files -o): modernize style Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-07-08	Jonathan Nieder	t9118 (git-svn): prevent early failure from taking... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-07-07	Jonathan Nieder	t/README: document more test helpers Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-06-29	Jonathan Nieder	revert: do not rebuild argv on heap Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-06-28	Jonathan Nieder	tests: local config file should be honored from subdirs... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-06-28	Jonathan Nieder	t7006: test pager configuration for several git commands Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-06-28	Jonathan Nieder	t7006 (pager): introduce helper for parameterized tests Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-06-14	Jonathan Nieder	t3508 (cherry-pick): futureproof against unmerged files Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-06-14	Jonathan Nieder	git-svn: strip off leading slashes on --trunk argument Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-06-13	Jonathan Nieder	add-interactive: Clarify “remaining hunks in the file” Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-06-13	Jonathan Nieder	grep: refactor grep_objects loop into its own function Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-06-11	Jonathan Nieder	Documentation/checkout: clarify description Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-06-11	Jonathan Nieder	rebase -i -p: document shortcomings Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-06-02	Jonathan Nieder	DWIM 'git show -5' to 'git show --do-walk -5' Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-06-01	Jonathan Nieder	gitignore.5: Clarify matching rules Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-06-01	Jonathan Nieder	rebase: improve error message when upstream argument... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-06-01	Jonathan Nieder	Documentation/checkout: clarify description Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-28	Jonathan Nieder	fsck: fix bogus commit header check Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-20	Jonathan Nieder	Add git remote set-branches Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-20	Jonathan Nieder	post-receive-email: document command-line mode Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-09	Jonathan Nieder	git svn: avoid uninitialized var in 'reset' Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-09	Jonathan Nieder	Makefile: let header dependency checker override COMPUTE_HEA... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-09	Jonathan Nieder	Makefile: fix header dependency checker to allow NO_CURL... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-09	Jonathan Nieder	Documentation/notes: nitpicks Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-09	Jonathan Nieder	Documentation/notes: clean up description of rewriting... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-09	Jonathan Nieder	Documentation/notes: simplify treatment of default... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-09	Jonathan Nieder	Documentation/log: add a CONFIGURATION section Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-09	Jonathan Nieder	Documentation/notes: simplify treatment of default... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-09	Jonathan Nieder	Documentation/notes: add configuration section Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-09	Jonathan Nieder	Documentation/notes: describe content of notes blobs Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-09	Jonathan Nieder	Documentation/notes: document format of notes trees Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-08	Jonathan Nieder	cherry-pick: do not dump core when iconv fails Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-08	Jonathan Nieder	pretty: initialize new cmt_fmt_map to 0 Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-08	Jonathan Nieder	adapt request-pull tests for new pull request format Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-06	Jonathan Nieder	test-lib: some shells do not let $? propagate into... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-04	Jonathan Nieder	shortlog: Document and test --format option Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-04	Jonathan Nieder	t4201 (shortlog): Test output format with multiple... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-04	Jonathan Nieder	t4201 (shortlog): guard setup with test_expect_success Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-04	Jonathan Nieder	Documentation/shortlog: scripted users should not rely... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-04	Jonathan Nieder	commit --amend: cope with missing display name Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-04	Jonathan Nieder	test-lib: Let tests specify commands to be run at end... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-01	Jonathan Nieder	fsck: check ident lines in commit objects Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-01	Jonathan Nieder	request-pull: protect against OPTIONS_KEEPDASHDASH... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-05-01	Jonathan Nieder	tests for request-pull Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-04-22	Jonathan Nieder	Documentation/Makefile: fix interrupted builds of user... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-04-20	Jonathan Nieder	fix "bundle --stdin" segfault Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-04-20	Jonathan Nieder	t5704 (bundle): add tests for bundle --stdin Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-04-17	Jonathan Nieder	tag -v: use RUN_GIT_CMD to run verify-tag Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-04-15	Jonathan Nieder	Document new "already-merged" rule for branch -d Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-04-15	Jonathan Nieder	Add .depend directories to .gitignore Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-04-15	Jonathan Nieder	t7006: guard cleanup with test_expect_success Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-04-13	Jonathan Nieder	t5800: testgit helper requires Python support Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-04-11	Jonathan Nieder	t7400: clarify submodule update tests Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-04-11	Jonathan Nieder	t7400: clarify 'submodule add' tests Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-04-11	Jonathan Nieder	t7400: split setup into multiple tests Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-04-04	Jonathan Nieder	Teach mailinfo %< as an alternative scissors mark Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-04-03	Jonathan Nieder	Makefile: future-proof Cygwin version check Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-03-21	Jonathan Nieder	merge-recursive: add a label for ancestor Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-03-21	Jonathan Nieder	cherry-pick, revert: add a label for ancestor Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-03-21	Jonathan Nieder	revert: clarify label on conflict hunks Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-03-21	Jonathan Nieder	compat: add mempcpy() Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-03-21	Jonathan Nieder	checkout -m --conflict=diff3: add a label for ancestor Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-03-21	Jonathan Nieder	merge_trees(): add ancestor label parameter for diff3... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-03-21	Jonathan Nieder	merge_file(): add comment explaining behavior wrt conflict... Signed-off-by: Jonathan Nieder <jrnieder@mgila.com>	commit \| commitdiff \| tree
2010-03-21	Jonathan Nieder	checkout --conflict=diff3: add a label for ancestor Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-03-21	Jonathan Nieder	ll_merge(): add ancestor label parameter for diff3... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-03-21	Jonathan Nieder	merge-file --diff3: add a label for ancestor Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-03-21	Jonathan Nieder	xdl_merge(): move file1 and file2 labels to xmparam... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-03-21	Jonathan Nieder	xdl_merge(): add optional ancestor label to diff3-style... Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-03-21	Jonathan Nieder	tests: document cherry-pick behavior in face of conflicts Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
2010-03-21	Jonathan Nieder	tests: document format of conflicts from checkout -m Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>	commit \| commitdiff \| tree
next

git with Jakub Narębski modifications

RSS Atom