9 Commits (ec136663c7d5a8e2ce1664ce79f2297e2e61c86f)

Author SHA1 Message Date
Tay Ray Chuan f0ecac2b70 merge: --log appends shortlog to message if specified 15 years ago
Tay Ray Chuan 97d45bcb2f merge: rename variable 15 years ago
Tay Ray Chuan 7558922028 merge: update comment 15 years ago
Christian Couder c674d05273 merge: make function try_merge_command non static 15 years ago
Christian Couder 3f9083cde3 merge: refactor code that calls "git merge-STRATEGY" 15 years ago
Linus Torvalds 81b50f3ce4 Move 'builtin-*' into a 'builtin/' subdirectory 15 years ago
Junio C Hamano 85e51b783c Make "subtree" part more orthogonal to the rest of merge-recursive. 15 years ago
Avery Pennarun 8cc5b29065 git merge -X<option> 15 years ago
Matthieu Moy d38a30df7d Be more user-friendly when refusing to do something because of conflict. 15 years ago
Junio C Hamano cfc5789ada resolve-undo: record resolved conflicts in a new index extension section 15 years ago
Junio C Hamano be6ff8196d builtin-merge.c: use standard active_cache macros 15 years ago
Junio C Hamano 77c29b4aca Revert recent "git merge <msg> HEAD <commit>..." deprecation 15 years ago
Junio C Hamano cb6020bb01 Teach --[no-]rerere-autoupdate option to merge, revert and friends 15 years ago
Junio C Hamano ce9d823b91 merge: do not add standard message when message is given with -m option 15 years ago
Junio C Hamano 76bf488e61 Do not misidentify "git merge foo HEAD" as an old-style invocation 15 years ago
Junio C Hamano b81e00a965 git-merge: a deprecation notice of the ancient command line syntax 15 years ago
Matthieu Moy e2ced7de19 builtin-merge: show user-friendly error messages for fast-forward too. 15 years ago
Avery Pennarun ed87465658 builtin-merge.c: call exclude_cmds() correctly. 15 years ago
Jonathan Nieder d629c40b0b merge: do not setup worktree twice 15 years ago
Björn Gustavsson 134748353b Teach 'git merge' and 'git pull' the option --ff-only 15 years ago
Felipe Contreras a75d7b5409 Use 'fast-forward' all over the place 15 years ago
Thomas Rast dd2e794a21 Refactor pretty_print_commit arguments into a struct 15 years ago
Jeff King 69a8b7c741 merge: indicate remote tracking branches in merge message 16 years ago
Jeff King 751c59746c merge: fix incorrect merge message for ambiguous tag/branch 16 years ago
Johannes Sixt 5709e0363a run_command: return exit code as positive value 16 years ago
Thomas Rast 0721c314a5 Use die_errno() instead of die() when checking syscalls 16 years ago
Thomas Rast d824cbba02 Convert existing die(..., strerror(errno)) to die_errno() 16 years ago
Linus Torvalds 2af202be3d Fix various sparse warnings in the git source code 16 years ago
Clemens Buchacher c8c562a238 refuse to merge during a merge 16 years ago
Stephen Boyd 3778292017 parse-opts: prepare for OPT_FILENAME 16 years ago
Allan Caffee 345f6e2cb5 builtin-merge: fix a typo in an error message 16 years ago
Junio C Hamano a552de75eb strbuf_branchname(): a wrapper for branch name shorthands 16 years ago
Junio C Hamano 431b1969fc Rename interpret/substitute nth_last_branch functions 16 years ago
Johannes Schindelin 7c4c97c0ac Turn the flags in struct dir_struct into a single variable 16 years ago
Junio C Hamano c9717ee970 Teach @{-1} to git merge 16 years ago
Alexander Potashev 34263de026 Replace deprecated dashed git commands in usage 16 years ago
Stephan Beyer ae98a0089f Move run_hook() from builtin-commit.c into run-command.c (libgit) 16 years ago
Alex Riesen 47d32af233 Make some of fwrite/fclose/write/close failures visible 16 years ago
Tuncer Ayaz 7f87aff22c Teach/Fix pull/fetch -q/-v options 16 years ago
Brandon Casey f285a2d7ed Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 16 years ago
Brandon Casey 36e40535dc builtin-merge.c: allocate correct amount of memory 16 years ago
Brandon Casey 19d4b416f4 Replace xmalloc/memset(0) pairs with xcalloc 16 years ago
Miklos Vajna cf10f9fdd5 builtin-commit: use reduce_heads() only when appropriate 16 years ago
Miklos Vajna 668f26fff6 builtin-merge: refresh the index before calling a strategy 16 years ago
Deskin Miller dc4179f9a7 maint: check return of split_cmdline to avoid bad config strings 16 years ago
Miklos Vajna ee20a129de commit_tree(): add a new author parameter 17 years ago
Miklos Vajna 4271666046 builtin-merge: release the lockfile in try_merge_strategy() 17 years ago
Miklos Vajna 18668f5319 builtin-merge: avoid run_command_v_opt() for recursive and subtree 17 years ago
Alex Riesen b9f62c0e7d Remove useless memset of static command name lists in builtin-merge.c 17 years ago
Alex Riesen e321180ed3 Remove calculation of the longest command name from where it is not used 17 years ago