summaryrefslogtreecommitdiff
path: root/git-rerere.perl
Commit message (Collapse)AuthorAgeFilesLines
* rm git-rerere.perl -- it is now a built-in.Junio C Hamano2007-01-081-284/+0
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* rerere: fix breakage of resolving.Junio C Hamano2006-12-181-1/+1
| | | | | | | | commit e2b70087 botched the RCS merge to git-merge-file conversion. There is no command called "git merge-file" (yes, we are using safer variant of Perl's system(3)). Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'ew/rerere'Junio C Hamano2006-12-131-0/+57
|\ | | | | | | | | | | | | * ew/rerere: rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am git-rerere: add 'gc' command. rerere: add clear, diff, and status commands
| * git-rerere: add 'gc' command.Junio C Hamano2006-12-091-0/+25
| | | | | | | | | | | | | | | | | | | | | | Over time, unresolved rr-cache entries are accumulated and they tend to get less and less likely to be useful as the tips of branches advance. Reorder documentation page to show the subcommand section earlier than the discussion section. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * rerere: add clear, diff, and status commandsEric Wong2006-12-091-0/+32
| | | | | | | | | | | | | | | | | | git-am and git-rebase will be updated to use 'clear', and diff/status can be used to aid the user in tracking progress in the resolution process. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Get rid of the dependency on RCS' merge programJohannes Schindelin2006-12-121-1/+1
|/ | | | | | | | Now that we have git-merge-file, an RCS merge lookalike, we no longer need it. So long, merge, and thanks for all the fish! Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* rerere: avoid open "-|" list form for Perl 5.6Junio C Hamano2006-02-201-1/+5
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-rerere: reuse recorded resolve.Junio C Hamano2006-02-061-0/+223
In a workflow that employs relatively long lived topic branches, the developer sometimes needs to resolve the same conflict over and over again until the topic branches are done (either merged to the "release" branch, or sent out and accepted upstream). This commit introduces a new command, "git rerere", to help this process by recording the conflicted automerge results and corresponding hand-resolve results on the initial manual merge, and later by noticing the same conflicted automerge and applying the previously recorded hand resolution using three-way merge. Signed-off-by: Junio C Hamano <junkio@cox.net>
View Lorry Controller Status