Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
github.com/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
github.com/git/git.git
jch
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
www-data
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
builtin-merge.c
Age
Commit message (
Expand
)
Author
2009-07-06
Merge branch 'tr/die_errno'
Junio C Hamano
2009-06-27
Use die_errno() instead of die() when checking syscalls
Thomas Rast
2009-06-27
Convert existing die(..., strerror(errno)) to die_errno()
Thomas Rast
2009-06-21
Fix various sparse warnings in the git source code
Linus Torvalds
2009-06-13
Merge branch 'cb/maint-no-double-merge'
Junio C Hamano
2009-06-02
refuse to merge during a merge
Clemens Buchacher
2009-05-25
parse-opts: prepare for OPT_FILENAME
Stephen Boyd
2009-04-28
Merge branch 'maint'
Junio C Hamano
2009-04-28
Merge branch 'maint-1.6.1' into maint
Junio C Hamano
2009-04-28
Merge branch 'maint-1.6.0' into maint-1.6.1
Junio C Hamano
2009-04-27
builtin-merge: fix a typo in an error message
Allan Caffee
2009-03-23
strbuf_branchname(): a wrapper for branch name shorthands
Junio C Hamano
2009-03-23
Rename interpret/substitute nth_last_branch functions
Junio C Hamano
2009-02-18
Turn the flags in struct dir_struct into a single variable
Johannes Schindelin
2009-02-14
Teach @{-1} to git merge
Junio C Hamano
2009-02-05
Replace deprecated dashed git commands in usage
Alexander Potashev
2009-01-18
Move run_hook() from builtin-commit.c into run-command.c (libgit)
Stephan Beyer
2008-12-05
Make some of fwrite/fclose/write/close failures visible
Alex Riesen
2008-11-15
Teach/Fix pull/fetch -q/-v options
Tuncer Ayaz
2008-10-20
Merge branch 'mv/merge-noff'
Junio C Hamano
2008-10-12
Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer
Brandon Casey
2008-10-09
Merge branch 'mv/merge-refresh'
Shawn O. Pearce
2008-10-09
Merge branch 'maint'
Shawn O. Pearce
2008-10-09
builtin-merge.c: allocate correct amount of memory
Brandon Casey
2008-10-08
Replace xmalloc/memset(0) pairs with xcalloc
Brandon Casey
2008-10-03
builtin-commit: use reduce_heads() only when appropriate
Miklos Vajna
2008-10-03
builtin-merge: refresh the index before calling a strategy
Miklos Vajna
2008-09-25
Merge branch 'mv/merge-recursive'
Shawn O. Pearce
2008-09-25
Merge branch 'mv/commit-tree'
Shawn O. Pearce
2008-09-25
Merge branch 'maint'
Shawn O. Pearce
2008-09-24
maint: check return of split_cmdline to avoid bad config strings
Deskin Miller
2008-09-11
commit_tree(): add a new author parameter
Miklos Vajna
2008-09-07
builtin-merge: release the lockfile in try_merge_strategy()
Miklos Vajna
2008-08-31
builtin-merge: avoid run_command_v_opt() for recursive and subtree
Miklos Vajna
2008-08-29
Remove useless memset of static command name lists in builtin-merge.c
Alex Riesen
2008-08-29
Remove calculation of the longest command name from where it is not used
Alex Riesen
2008-08-28
Merge branch 'mv/merge-custom'
Junio C Hamano
2008-08-25
Merge branch 'maint' to sync with 1.6.0.1
Junio C Hamano
2008-08-24
merge: fix numerus bugs around "trivial merge" area
Junio C Hamano
2008-08-22
provide more errors for the "merge into empty head" case
Paolo Bonzini
2008-08-21
Fix "git-merge -s bogo" help text
Junio C Hamano
2008-08-21
"git-merge": allow fast-forwarding in a stat-dirty tree
Junio C Hamano
2008-07-30
Fix merge name generation in "merge in C"
Junio C Hamano
2008-07-30
builtin-merge: allow using a custom strategy
Miklos Vajna
2008-07-24
Make non-static functions, that may be static, static
Stephan Beyer
2008-07-22
builtin-merge: add missing structure initialization
Pierre Habouzit
2008-07-22
builtin-merge: give a proper error message for invalid strategies in config
Miklos Vajna
2008-07-21
builtin-merge.c: Fix option parsing
Michele Ballabio
2008-07-20
Teach 'git merge' that some merge strategies no longer exist
Miklos Vajna
2008-07-16
Merge branch 'mv/merge-in-c'
Junio C Hamano
[next]