summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2018-05-02rebase --skip: clean up commit message after a failed fixup/squashLibravatar Johannes Schindelin2-17/+131
2018-05-02sequencer: always commit without editing when asked forLibravatar Johannes Schindelin1-0/+2
2018-05-02rebase -i: Handle "combination of <n> commits" with GETTEXT_POISONLibravatar Johannes Schindelin2-35/+49
2018-05-02rebase -i: demonstrate bugs with fixup!/squash! commit messagesLibravatar Johannes Schindelin1-0/+22
2018-04-30Remove obsolete script to convert grafts to replace refsLibravatar Johannes Schindelin1-28/+0
2018-04-30technical/shallow: describe why shallow cannot use replace refsLibravatar Johannes Schindelin1-0/+7
2018-04-30technical/shallow: stop referring to graftsLibravatar Johannes Schindelin1-9/+4
2018-04-30filter-branch: stop suggesting to use graftsLibravatar Johannes Schindelin1-1/+1
2018-04-30Deprecate support for .git/info/graftsLibravatar Johannes Schindelin4-0/+22
2018-04-30Add a test for `git replace --convert-graft-file`Libravatar Johannes Schindelin1-0/+28
2018-04-30replace: introduce --convert-graft-fileLibravatar Johannes Schindelin2-4/+51
2018-04-30replace: prepare create_graft() for converting graft files wholesaleLibravatar Johannes Schindelin1-3/+8
2018-04-30replace: "libify" create_graft() and calleesLibravatar Johannes Schindelin1-57/+112
2018-04-30tests: introduce test_unset_prereq, for debuggingLibravatar Johannes Schindelin1-1/+13
2018-04-30worktree: teach "add" to check out existing branchesLibravatar Thomas Gummerer3-11/+37
2018-04-30worktree: factor out dwim_branch functionLibravatar Thomas Gummerer1-11/+18
2018-04-30worktree: improve message when creating a new worktreeLibravatar Thomas Gummerer1-2/+36
2018-04-30worktree: remove extra members from struct add_optsLibravatar Thomas Gummerer1-17/+16
2018-04-27.gitattributes: add a diff driver for PythonLibravatar Ævar Arnfjörð Bjarmason1-0/+1
2018-04-27.gitattributes: use the "perl" differ for PerlLibravatar Ævar Arnfjörð Bjarmason1-3/+3
2018-04-27.gitattributes: add *.pl extension for PerlLibravatar Ævar Arnfjörð Bjarmason1-0/+1
2018-04-26replace: avoid using die() to indicate a bugLibravatar Johannes Schindelin1-1/+1
2018-04-26commit: Let the callback of for_each_mergetag return on errorLibravatar Johannes Schindelin4-15/+18
2018-04-26argv_array: offer to split a string by whitespaceLibravatar Johannes Schindelin2-0/+22
2018-04-26rebase -i --rebase-merges: add a section to the man pageLibravatar Johannes Schindelin1-0/+135
2018-04-26rebase -i: introduce --rebase-merges=[no-]rebase-cousinsLibravatar Johannes Schindelin7-6/+59
2018-04-26pull: accept --rebase=merges to recreate the branch topologyLibravatar Johannes Schindelin5-10/+38
2018-04-26rebase --rebase-merges: avoid "empty merges"Libravatar Johannes Schindelin2-0/+15
2018-04-26sequencer: handle post-rewrite for merge commandsLibravatar Johannes Schindelin2-1/+29
2018-04-26sequencer: make refs generated by the `label` command worktree-localLibravatar Johannes Schindelin2-1/+16
2018-04-26rebase --rebase-merges: add test for --keep-emptyLibravatar Phillip Wood1-0/+1
2018-04-26rebase: introduce the --rebase-merges optionLibravatar Johannes Schindelin5-2/+207
2018-04-26rebase-helper --make-script: introduce a flag to rebase mergesLibravatar Johannes Schindelin3-2/+349
2018-04-26sequencer: fast-forward `merge` commands, if possibleLibravatar Johannes Schindelin1-1/+32
2018-04-26sequencer: introduce the `merge` commandLibravatar Johannes Schindelin2-0/+204
2018-04-26sequencer: introduce new commands to reset the revisionLibravatar Johannes Schindelin2-7/+208
2018-04-26git-rebase--interactive: clarify argumentsLibravatar Stefan Beller1-7/+7
2018-04-26sequencer: offer helpful advice when a command was rescheduledLibravatar Johannes Schindelin1-0/+16
2018-04-26sequencer: refactor how original todo list lines are accessedLibravatar Johannes Schindelin1-24/+36
2018-04-26sequencer: make rearrange_squash() a bit more obviousLibravatar Johannes Schindelin1-1/+1
2018-04-26sequencer: avoid using errno clobbered by rollback_lock_file()Libravatar Johannes Schindelin1-4/+6
2018-04-26perf/aggregate: use Getopt::Long for option parsingLibravatar Christian Couder1-36/+26
2018-04-26cache.h: allow oid_object_info to handle arbitrary repositoriesLibravatar Stefan Beller4-52/+54
2018-04-26packfile: add repository argument to cache_or_unpack_entryLibravatar Stefan Beller1-2/+3
2018-04-26packfile: add repository argument to unpack_entryLibravatar Stefan Beller4-6/+9
2018-04-26packfile: add repository argument to read_objectLibravatar Stefan Beller1-3/+5
2018-04-26packfile: add repository argument to packed_object_infoLibravatar Jonathan Nieder4-5/+7
2018-04-26packfile: add repository argument to packed_to_object_typeLibravatar Stefan Beller1-7/+9
2018-04-26packfile: add repository argument to retry_bad_packed_offsetLibravatar Stefan Beller1-3/+5
2018-04-26cache.h: add repository argument to oid_object_infoLibravatar Stefan Beller32-53/+67