index
:
tgif.git
2.36
Terin's Improved Git Fork
terinjokes@gmail.com
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
builtin
/
merge.c
Age
Commit message (
Expand
)
Author
Files
Lines
2014-10-01
try_merge_strategy(): use a statically-allocated lock_file object
Michael Haggerty
1
-7
/
+7
2014-10-01
try_merge_strategy(): remove redundant lock_file allocation
Michael Haggerty
1
-1
/
+0
2014-09-26
Merge branch 'rs/realloc-array'
Junio C Hamano
1
-1
/
+1
2014-09-19
Merge branch 'ah/grammofix'
Junio C Hamano
1
-2
/
+2
2014-09-18
use REALLOC_ARRAY for changing the allocation size of arrays
René Scharfe
1
-1
/
+1
2014-09-02
grammofix in user-facing messages
Alex Henrie
1
-2
/
+2
2014-08-20
run-command: introduce CHILD_PROCESS_INIT
René Scharfe
1
-2
/
+1
2014-07-16
Merge branch 'rs/code-cleaning'
Junio C Hamano
1
-6
/
+4
2014-07-16
Merge branch 'nd/split-index'
Junio C Hamano
1
-8
/
+4
2014-07-10
merge: simplify merge_trivial() by using commit_list_append()
René Scharfe
1
-6
/
+4
2014-07-10
Merge branch 'mg/verify-commit'
Junio C Hamano
1
-4
/
+1
2014-07-02
Merge branch 'jk/commit-buffer-length'
Junio C Hamano
1
-4
/
+4
2014-06-23
gpg-interface: provide clear helper for struct signature_check
Michael J Gruber
1
-4
/
+1
2014-06-13
read-cache: new API write_locked_index instead of write_index/write_cache
Nguyễn Thái Ngọc Duy
1
-8
/
+4
2014-06-12
commit_tree: take a pointer/len pair rather than a const strbuf
Jeff King
1
-4
/
+4
2014-06-03
Merge branch 'fc/merge-default-to-upstream'
Junio C Hamano
1
-1
/
+1
2014-06-03
Merge branch 'mh/ref-transaction'
Junio C Hamano
1
-3
/
+3
2014-04-22
merge: enable defaulttoupstream by default
Felipe Contreras
1
-1
/
+1
2014-04-08
Merge branch 'jc/rev-parse-argh-dashed-multi-words'
Junio C Hamano
1
-1
/
+1
2014-04-07
refs.h: rename the action_on_err constants
Michael Haggerty
1
-3
/
+3
2014-03-28
Merge branch 'bp/commit-p-editor'
Junio C Hamano
1
-3
/
+3
2014-03-24
parse-options: multi-word argh should use dash to separate words
Junio C Hamano
1
-1
/
+1
2014-03-18
merge: fix GIT_EDITOR override for commit hook
Benoit Pierre
1
-1
/
+1
2014-03-18
commit: fix patch hunk editing with "commit -p -m"
Benoit Pierre
1
-3
/
+3
2014-02-27
Merge branch 'nv/commit-gpgsign-config'
Junio C Hamano
1
-0
/
+3
2014-02-24
commit-tree: add the commit.gpgsign option to sign all commits
Nicolas Vigier
1
-0
/
+3
2014-01-27
Merge branch 'ef/mingw-write'
Junio C Hamano
1
-1
/
+1
2014-01-17
prefer xwrite instead of write
Erik Faye-Lund
1
-1
/
+1
2013-12-05
replace {pre,suf}fixcmp() with {starts,ends}_with()
Christian Couder
1
-6
/
+6
2013-10-31
merge: simplify ff-only option
Felipe Contreras
1
-9
/
+2
2013-09-17
Merge branch 'rh/ishes-doc'
Junio C Hamano
1
-1
/
+1
2013-09-04
use 'commit-ish' instead of 'committish'
Richard Hansen
1
-1
/
+1
2013-08-05
Replace deprecated OPT_BOOLEAN by OPT_BOOL
Stefan Beller
1
-6
/
+6
2013-07-22
Merge branch 'nd/const-struct-cache-entry'
Junio C Hamano
1
-1
/
+1
2013-07-15
Merge branch 'mv/merge-ff-tristate'
Junio C Hamano
1
-22
/
+33
2013-07-12
Merge branch 'ms/remote-tracking-branches-in-doc'
Junio C Hamano
1
-2
/
+2
2013-07-09
Convert "struct cache_entry *" to "const ..." wherever possible
Nguyễn Thái Ngọc Duy
1
-1
/
+1
2013-07-03
Change "remote tracking" to "remote-tracking"
Michael Schubert
1
-2
/
+2
2013-07-02
merge: handle --ff/--no-ff/--ff-only as a tri-state option
Miklos Vajna
1
-22
/
+33
2013-05-08
merge: use help_unknown_ref()
Vikrant Varma
1
-1
/
+2
2013-04-05
Merge branch 'sg/gpg-sig'
Junio C Hamano
1
-1
/
+36
2013-04-05
Merge branch 'jc/merge-tag-object'
Junio C Hamano
1
-0
/
+13
2013-03-31
merge/pull Check for untrusted good GPG signatures
Sebastian Götte
1
-0
/
+3
2013-03-31
merge/pull: verify GPG signatures of commits being merged
Sebastian Götte
1
-1
/
+33
2013-03-19
merge: a random object may not necssarily be a commit
Junio C Hamano
1
-0
/
+13
2013-02-04
Merge branch 'jc/custom-comment-char'
Junio C Hamano
1
-3
/
+2
2013-01-16
Allow custom "comment char"
Junio C Hamano
1
-3
/
+2
2013-01-10
Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'
Junio C Hamano
1
-0
/
+1
2013-01-09
Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure'
Junio C Hamano
1
-2
/
+3
2013-01-03
merge: Honor prepare-commit-msg return code
Antoine Pelisse
1
-2
/
+3
[prev]
[next]