repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: do not look at the index during recursive merge
2018-01-09
Ju
n
io
C Hamano
merge-
r
ecursiv
e
:
do not look at the index during recur
s
ive
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-12-22
Elijah Newren
merge-recursive: a
v
oid incorpora
t
ing uncommitted changes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-12-22
El
i
jah
N
ewren
move index_has_changes
(
)
from
builtin/am
.
c to merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-12-22
Elijah New
r
en
t6044: r
e
curs
i
v
e
can silently inco
r
p
o
rat
e
dir
t
y
chan
g
es
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-12-06
Junio
C
Hamano
Pre
p
are fo
r
2
.
15
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-12-06
Junio
C H
a
m
a
no
M
e
rge branch 'jc/merge
-
base-fork-point-do
c
' into ma
i
n
t
commit
|
commitdiff
|
tree
2017-12-06
Junio
C
Hamano
Merge b
r
anch 'tz/re
d
ir
e
ct-fix' into maint
commit
|
commitdiff
|
tree
2017-12-06
Junio C Hamano
Merge br
a
n
ch 'tz/notes
-
error-
t
o-stderr' in
t
o
maint
commit
|
commitdiff
|
tree
2017-12-06
Junio
C H
a
man
o
Merge branch 'sb/test-cherry
-
p
ic
k
-submodul
e
-
gett
i
ng
.
.
.
commit
|
commitdiff
|
tree
2017-12-06
Juni
o
C
Haman
o
Merge branch '
p
w
/
s
e
qu
e
ncer-recover-from-un
l
ockable
.
.
.
commit
|
commitdiff
|
tree
2017-12-06
Juni
o
C
Hamano
Merge branch 'rs/apply-inaccur
a
t
e-e
o
f-with
-
i
n
c
omplete
.
.
.
commit
|
commitdiff
|
tree
2017-12-06
J
unio C Hamano
Merge br
a
nch 'tz/complete-branch-co
p
y' into maint
commit
|
commitdiff
|
tree
2017-12-06
J
unio C
Hamano
Merg
e
b
r
a
nch 'ew/reb
a
se-mboxrd'
i
nto m
a
int
commit
|
commitdiff
|
tree
2017-12-06
Junio C Hamano
Merge
b
ranch 'sd/
b
ranch-cop
y
' into ma
i
nt
commit
|
commitdiff
|
tree
2017-12-06
Junio C
H
amano
Merge b
r
anch 'sw/pull-ip
v
46
-
passthru
'
into mai
n
t
commit
|
commitdiff
|
tree
2017-12-06
Junio C
H
amano
Merge branch 'bc/s
u
bmitting-patche
s
-in-asciidoc' into
.
.
.
commit
|
commitdiff
|
tree
2017-12-06
Ju
n
io C Ham
a
no
Merge branch 'mh/avoid-r
e
writing-p
a
cked
-
refs' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2017-11-28
Junio C Hamano
G
i
t
2
.
15
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-28
Junio C Hamano
Merge branch
'rs/confi
g
-wri
t
e-section-fix'
into
maint
commit
|
commitdiff
|
tree
2017-11-27
Junio C Hamano
A bit mor
e
f
i
xes for
2
.
15
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-27
J
u
nio C
H
a
m
ano
M
e
r
g
e branch
'ma/red
u
ce-heads-leakfix' into maint
commit
|
commitdiff
|
tree
2017-11-27
Junio C
Hamano
Merge branch 'ma/bisec
t
-leakfix
'
in
t
o maint
commit
|
commitdiff
|
tree
2017-11-27
J
unio
C
Ha
m
a
n
o
Merge branch '
r
s/apply-fuzzy-ma
t
ch-fix' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2017-11-27
Junio C Hamano
Merge
branch
'
a
d/sub
m
i
t
ting-p
a
tches-titl
e
-decorati
o
n
.
.
.
commit
|
commitdiff
|
tree
2017-11-27
J
u
nio
C
Hamano
Merge branch 'rs/imap-send-next-arg-fix' into maint
commit
|
commitdiff
|
tree
2017-11-26
T
odd Zullinger
Re
l
N
otes:
minor typo fi
x
es in 2
.
15
.
1 draft
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-21
Junio C Hamano
A
lmost ready for 2
.
15
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-21
Junio C
Haman
o
Merge branch 'rs/seq
u
enc
e
r
-
rewrite-fi
l
e-cleanu
p
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2017-11-21
Junio C Hamano
M
erge branch 'cb/t4
2
01-robustify' into maint
commit
|
commitdiff
|
tree
2017-11-21
Junio C Hamano
Me
r
ge
b
ranch 't
z
/f
s
f-ad
d
r
e
ss-u
p
date' into maint
commit
|
commitdiff
|
tree
2017-11-21
Junio C Hama
n
o
Merge
bran
c
h 'ad
/
rebase-i-serie-typ
o
fix'
i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2017-11-21
Ju
n
io C
H
amano
M
e
rge br
a
n
c
h
'jk/i
n
fo-a
l
ternates-fix' into main
t
commit
|
commitdiff
|
tree
2017-11-21
J
unio C H
a
mano
Merge branch 'ab/pcre-v2' in
t
o
mai
n
t
commit
|
commitdiff
|
tree
2017-11-21
J
u
nio C Haman
o
Merge branch 'sr/
w
rappe
r
-
q
uote-file
n
ames' int
o
maint
commit
|
commitdiff
|
tree
2017-11-21
Junio
C Ham
a
no
Merge b
r
anch 'bw/rebase-
i
-ignored-s
u
bmodule-fix
'
into
.
.
.
commit
|
commitdiff
|
tree
2017-11-21
Shuyu
Wei
pull: pass -4/
-
6
option
t
o 'git fetch'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-18
René
S
ch
a
rfe
config: flip retu
r
n value of
writ
e
_s
e
ction()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-18
Eri
c
Wong
rebase: use mboxrd fo
r
mat to avoid split errors
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-17
R
e
n
é Scharfe
apply:
update lin
e
l
e
ngths for --inaccurate-e
o
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-17
T
odd Zul
l
inger
completi
o
n:
ad
d
'--copy' option to
'
git
b
ranch'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-16
Phill
i
p Wood
se
q
uenc
e
r:
r
esc
h
edu
l
e pick if index can't be locked
commit
|
commitdiff
|
tree
2017-11-16
Phillip Wood
con
f
i
g: avoid "
w
rite_in_
f
ull(fd,
b
uf, len) != len"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-15
Elijah Newren
merge-recursive: handle addition of s
u
b
mo
d
ul
e
on o
u
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-15
Junio C
H
amano
S
t
a
rt preparation f
o
r 2
.
1
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-15
Junio
C
Ham
a
no
Merge branch 'ks/mailmap'
int
o
maint
commit
|
commitdiff
|
tree
2017-11-15
Junio
C Hamano
Merg
e
bra
n
ch 'j
m
/
reln
o
tes-
2
.
15-typofix' into maint
commit
|
commitdiff
|
tree
2017-11-15
Junio C Hamano
Merge br
a
nch 'cn/diff-indent-no-longer-is-exper
i
mental
.
.
.
commit
|
commitdiff
|
tree
2017-11-15
Junio C Hamano
M
e
rg
e
bra
n
ch 'js/mingw-redirect-std-h
a
ndles'
i
nto maint
commit
|
commitdiff
|
tree
2017-11-15
Junio C
Hamano
M
e
rg
e
branch 'js/
w
incre
d
-em
p
ty-cred' into
m
a
in
t
commit
|
commitdiff
|
tree
2017-11-15
J
unio C
H
a
m
an
o
M
e
rge bran
c
h 'js/mi
n
gw
-
full-ve
r
sion-in-resources'
into
.
.
.
commit
|
commitdiff
|
tree
2017-11-15
Junio C Ha
m
ano
Merge branch '
d
k/libsecret-unlock-
t
o-load
-
fix'
into
.
.
.
commit
|
commitdiff
|
tree
2017-11-15
Juni
o
C Hamano
Merg
e
b
ranch 'js/ear
l
y-config' into maint
commit
|
commitdiff
|
tree
2017-11-15
Junio
C
Haman
o
Merge branc
h
'ad/5580-unc-tests-on-cygwin' into
maint
commit
|
commitdiff
|
tree
2017-11-15
Junio C H
a
mano
Merg
e
branch 'ao/d
i
f
f-p
o
pu
l
ate-filespec
-
l
stat-erro
r
p
ath
.
.
.
commit
|
commitdiff
|
tree
2017-11-15
Juni
o
C Ham
a
no
Mer
g
e branch 'sb/
b
lame-config-doc' into maint
commit
|
commitdiff
|
tree
2017-11-15
Junio C H
a
mano
Merge branch 'tb/complete-ch
e
ckout' into maint
commit
|
commitdiff
|
tree
2017-11-15
Junio C Hama
n
o
Mer
g
e
br
a
nch 'jc/check
-
ref-f
o
rmat-oor' into m
a
int
commit
|
commitdiff
|
tree
2017-11-15
Junio C Hamano
Merg
e
branch
'jc/t5601-copy
-
wor
k
around' into maint
commit
|
commitdiff
|
tree
2017-11-15
Juni
o
C
Ha
m
a
n
o
M
erge branch '
j
k/reb
a
se-i-e
x
ec-gitdir-fix' into maint
commit
|
commitdiff
|
tree
2017-11-15
Junio C Hamano
Merge
b
r
anc
h
'bw/grep-recurse-s
u
bmo
d
u
l
es
'
in
t
o main
t
commit
|
commitdiff
|
tree
2017-11-15
Junio C Hamano
Me
r
ge
b
ranch 'js/submo
d
ule-in-excluded' into maint
commit
|
commitdiff
|
tree
2017-11-15
Junio C Hama
n
o
Merge
branc
h
'ao/
c
h
e
ck-resolve
-
ref-uns
a
fe-result' into
.
.
.
commit
|
commitdiff
|
tree
2017-11-15
J
u
nio C
Hamano
Me
r
ge branc
h
'
j
k/mi
s
c-resol
v
e-ref-unsafe-f
i
xes' into
.
.
.
commit
|
commitdiff
|
tree
2017-11-15
Junio C Hamano
M
erge
b
r
a
n
c
h 'sb/diff-c
o
lor-moved
-
use-xdl-
r
ecmatch
.
.
.
commit
|
commitdiff
|
tree
2017-11-15
Junio C Hama
n
o
Merge br
a
nc
h
'jk/di
f
f-color-moved-fix' int
o
maint
commit
|
commitdiff
|
tree
2017-11-15
Junio
C
Hamano
M
erge branch 'kd/au
t
o
-col-with-
p
ager-fix' into main
t
commit
|
commitdiff
|
tree
2017-11-15
Junio C H
a
man
o
Merge branch 'sg/
t
ra
v
is-fixes' into mai
n
t
commit
|
commitdiff
|
tree
2017-11-15
T
o
dd Zullinge
r
not
e
s: send "A
u
tom
a
tic
n
otes m
e
rge fai
l
ed" messa
g
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-14
Todd Zullinger
rebase:
fix stde
r
r redirect in apply
_
autostash()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-14
To
d
d
Z
u
llinger
t/lib-gpg: fix gpgc
o
nf
std
e
rr redirect to /dev/null
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-13
Jeff
K
i
n
g
link_alt_odb_entries: make
e
m
pty input a n
o
op
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-13
brian m
.
car
l
s
on
Documen
t
a
tion: c
o
nver
t
Su
b
mitt
i
n
g
Patc
h
es
t
o Ascii
D
oc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-13
Charles Ba
i
ley
grep
:
fix NO_LIBPCR
E
1_J
I
T to fully
disable JIT
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-13
C
harles Bailey
t4201: make u
s
e of
abbreviation in t
h
e test m
o
re rob
u
st
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-12
Stefan
Beller
t/3512
:
d
e
m
o
nstra
t
e unrelated sub
m
odule/file
c
o
nflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-12
R
e
né Scharfe
apply: avoid ou
t
-of-bo
u
nds access
in fuzzy_matchlines()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-10
Adam D
i
nw
o
odie
d
o
c/
S
ub
m
itt
i
ngPatches: c
o
rrect subject guidance
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-09
Junio C Hamano
Merg
e
branch
'
tz/fsf-a
d
dress-update' of
.
.
/git
-
g
ui
.
.
.
commit
|
commitdiff
|
tree
2017-11-09
Todd Zullinger
Replace
Free Soft
w
are
F
ounda
t
ion add
r
ess in license
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-09
T
o
d
d Zullinger
Replace Free Softw
a
re
Foundatio
n
ad
d
ress in lice
n
s
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-09
Adam Dinwoodie
rebase -i: fix
c
o
mm
e
nt t
y
po
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-09
Jun
i
o C Hamano
merge-base --fork-point doc
:
clarify the
e
xample and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-08
Ma
r
tin
Å
gren
reduce_heads: f
i
x memory leaks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-08
Martin Ågren
bui
l
ti
n
/
merge-base:
fre
e
c
ommit
l
ists
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-07
B
ran
d
on Williams
wt-statu
s
: actually ignore submodu
l
es when requeste
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-06
Sim
o
n
Ruder
i
ch
wrapper
.
c
:
consistently quote filenames in error messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-06
Je
a
n Carlo Mac
h
ado
fix typo
s
in 2
.
15
.
0 release notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-06
Martin
Å
g
r
en
bisect: fix memory
leak when returning
best element
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-06
M
a
rtin Ågren
bisect: fix off-by-one err
o
r in `be
s
t_bisection_sorted()`
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-06
Martin
Å
gren
bisect: fix memor
y
leak in `find_bisection()`
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-06
Ma
r
tin
Å
g
r
en
b
ise
c
t: change calling-conv
e
ntion of `find_bisectio
n
()`
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-06
Ste
f
an
Beller
config: document blame configuration
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-04
Dennis Kaa
r
semaker
credential-li
b
s
ecret
:
u
nlock locked secrets
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-03
Jeff King
setup: avoid
d
o
u
ble slashes when looking for
H
EAD
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-03
K
a
artic Sivaraam
ma
i
lmap:
u
se Kaartic
S
ivaraam's new ad
d
ress
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-03
R
e
n
é
Scharfe
imap-send: handl
e
missing response codes gr
a
cef
u
lly
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-03
René Sc
h
arfe
imap-send: handle NULL ret
u
rn of next_
a
rg()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-02
Ca
r
los
M
artín Nieto
diff: --indent-heuristic is no longer experimental
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-02
Simon Ruderich
sequencer
.
c
: check return va
l
ue of close() in rewrite_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2017-11-02
J
ohan
n
es S
c
hindelin
mingw:
docum
e
n
t
t
he standard handle
r
edirection
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next