granicus.if.org Git - git/search

]> granicus.if.org Git - git/search

2019-02-14	Elijah Newren	git-rebase.txt: update to reflect merge now implemented... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2019-01-10	Elijah Newren	git-show-ref.txt: fix order of flags Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2019-01-07	Elijah Newren	rebase: implement --merge via the interactive machinery Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-12-28	Elijah Newren	rebase: define linearization ordering and enforce it Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-12-28	Elijah Newren	git-legacy-rebase: simplify unnecessary triply-nested if Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-12-28	Elijah Newren	git-rebase, sequencer: extend --quiet option for the... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-12-28	Elijah Newren	am, rebase--merge: do not overlook --skip'ed commits... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-12-28	Elijah Newren	t5407: add a test demonstrating how interactive handles... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-12-28	Elijah Newren	rebase: fix incompatible options error message Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-12-28	Elijah Newren	rebase: make builtin and legacy script error messages... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-12-09	Elijah Newren	git-rebase.txt: update note about directory rename... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-11-17	Elijah Newren	fast-export: add a --show-original-ids option to show... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-11-17	Elijah Newren	fast-import: remove unmaintained duplicate documentation Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-11-17	Elijah Newren	fast-export: add --reference-excluded-parents option Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-11-17	Elijah Newren	fast-export: ensure we export requested refs Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-11-17	Elijah Newren	fast-export: when using paths, avoid corrupt stream... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-11-17	Elijah Newren	fast-export: move commit rewriting logic into a function... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-11-17	Elijah Newren	fast-export: avoid dying when filtering by paths and... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-11-17	Elijah Newren	fast-export: use value from correct enum Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-11-17	Elijah Newren	git-fast-export.txt: clarify misleading documentation... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-11-17	Elijah Newren	git-fast-import.txt: fix documentation for --quiet... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-11-17	Elijah Newren	fast-export: convert sha1 to oid Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-11-08	Elijah Newren	t6036, t6043: increase code coverage for file collision... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-11-08	Elijah Newren	merge-recursive: improve rename/rename(1to2)/add[/add... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-11-08	Elijah Newren	merge-recursive: use handle_file_collision for add... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-11-08	Elijah Newren	merge-recursive: improve handling for rename/rename... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-11-08	Elijah Newren	merge-recursive: fix rename/add conflict handling Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-11-08	Elijah Newren	merge-recursive: new function for better colliding... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-11-08	Elijah Newren	merge-recursive: increase marker length with depth... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-11-08	Elijah Newren	t6036, t6042: testcases for rename collision of already... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-11-08	Elijah Newren	t6042: add tests for consistency in file collision... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-10-22	Elijah Newren	fsck: move fsck_head_link() to get_default_heads()... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-10-18	Elijah Newren	merge-recursive: avoid showing conflicts with merge... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-10-18	Elijah Newren	merge-recursive: improve auto-merging messages with... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-09-27	Elijah Newren	commit: fix erroneous BUG, 'multiple renames on the... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-09-20	Elijah Newren	merge-recursive: rename merge_file_1() and merge_content() Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-09-20	Elijah Newren	merge-recursive: remove final remaining caller of merge_file... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-09-20	Elijah Newren	merge-recursive: avoid wrapper function when unnecessary... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-09-20	Elijah Newren	merge-recursive: set paths correctly when three-way... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-09-13	Elijah Newren	sequencer: fix --allow-empty-message behavior, make... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-09-12	Elijah Newren	update-ref: allow --no-deref with --stdin Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-09-12	Elijah Newren	update-ref: fix type of update_flags variable to match... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-09-11	Elijah Newren	rerere: avoid buffer overrun Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-09-11	Elijah Newren	t4200: demonstrate rerere segfault on specially crafted... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-09-05	Elijah Newren	Remove superfluous trailing semicolons Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-08-30	Elijah Newren	am: avoid directory rename detection when calling recursive... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-08-30	Elijah Newren	merge-recursive: add ability to turn off directory... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-08-30	Elijah Newren	t3401: add another directory rename testcase for rebase... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-08-15	Elijah Newren	Remove forward declaration of an enum Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-08-15	Elijah Newren	compat/precompose_utf8.h: use more common include guard... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-08-15	Elijah Newren	urlmatch.h: fix include guard Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-08-15	Elijah Newren	Move definition of enum branch_track from cache.h to... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-08-15	Elijah Newren	alloc: make allocate_alloc_state and clear_alloc_state... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-08-15	Elijah Newren	Add missing includes and forward declarations Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-08-08	Elijah Newren	git-update-index.txt: reword possibly confusing example Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-08-08	Elijah Newren	t7406: avoid using test_must_fail for commands other... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-08-08	Elijah Newren	t7406: prefer test_* helper functions to test -[feds] Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-08-08	Elijah Newren	t7406: avoid having git commands upstream of a pipe Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-08-08	Elijah Newren	t7406: simplify by using diff --name-only instead of... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-08-08	Elijah Newren	t7406: fix call that was failing for the wrong reason Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-08-06	Elijah Newren	t3031: update test description to mention desired behavior Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-31	Elijah Newren	read-cache: fix directory/file conflict handling in... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-31	Elijah Newren	t1015: demonstrate directory/file conflict recovery... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-27	Elijah Newren	merge-recursive: preserve skip_worktree bit when necessary Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-11	Elijah Newren	t7405: verify 'merge --abort' works after submodule... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-11	Elijah Newren	t7405: add a directory/submodule conflict Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-11	Elijah Newren	t7405: add a file/submodule conflict Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-11	Elijah Newren	merge: fix misleading pre-merge check documentation Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-11	Elijah Newren	merge-recursive: enforce rule that index matches head... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-11	Elijah Newren	t6044: add more testcases with staged changes before... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-11	Elijah Newren	merge-recursive: fix assumption that head tree being... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-11	Elijah Newren	merge-recursive: make sure when we say we abort that... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-11	Elijah Newren	t6044: add a testcase for index matching head, when... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-11	Elijah Newren	t6036: add a failed conflict detection case: regular... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-06	Elijah Newren	t6036: add lots of detail for directory/file conflicts... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-03	Elijah Newren	t6042: add testcase covering long chains of rename... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-03	Elijah Newren	t6042: add testcase covering rename/rename(2to1)/delete... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-03	Elijah Newren	t6042: add testcase covering rename/add/delete conflict... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-03	Elijah Newren	t6036: add a failed conflict detection case with conflicting... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-03	Elijah Newren	t6036: add a failed conflict detection case with submodule... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-03	Elijah Newren	t6036: add a failed conflict detection case with submodule... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-03	Elijah Newren	t6036: add a failed conflict detection case with symlink... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-03	Elijah Newren	t6036: add a failed conflict detection case with symlink... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-03	Elijah Newren	t6044: verify that merges expected to abort actually... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-03	Elijah Newren	index_has_changes(): avoid assuming operating on the_index Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-07-03	Elijah Newren	read-cache.c: move index_has_changes() from merge.c Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-06-28	Elijah Newren	t5407: fix test to cover intended arguments Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-06-28	Elijah Newren	apply: fix grammar error in comment Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-06-27	Elijah Newren	git-rebase--merge: modernize "git-$cmd" to "git $cmd" Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-06-27	Elijah Newren	Fix use of strategy options with interactive rebases Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-06-27	Elijah Newren	t3418: add testcase showing problems with rebase -i... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-06-27	Elijah Newren	git-rebase: make --allow-empty-message the default Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-06-27	Elijah Newren	t3401: add directory rename testcases for rebase and am Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-06-27	Elijah Newren	git-rebase.txt: document behavioral differences between... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-06-27	Elijah Newren	directory-rename-detection.txt: technical docs on abilities... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-06-27	Elijah Newren	git-rebase.txt: address confusion between --no-ff vs... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-06-27	Elijah Newren	git-rebase: error out when incompatible options passed Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-06-27	Elijah Newren	t3422: new testcases for checking when incompatible... Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-06-26	Elijah Newren	git-rebase.sh: update help messages a bit Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
2018-06-26	Elijah Newren	git-rebase.txt: document incompatible options Signed-off-by: Elijah Newren <newren@gmail.com>	commit \| commitdiff \| tree
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom