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: save merge state earlier
2017-08-23
Michael J
Grub
e
r
m
e
rge
:
s
ave
m
erge state earl
i
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-23
Mich
a
el J Gruber
merge: s
p
lit write
_
merge_st
a
t
e in two
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-23
Mic
h
ael J Gr
u
b
er
merge:
clarify
c
all chain
Suggested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-22
Michael J Gruber
Docu
m
entation/git-merg
e
:
ex
p
lain --c
o
ntin
u
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-04
J
unio C Hamano
Git
2
.
1
4
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-04
Junio C Hama
n
o
Me
r
ge tag
'
v2
.
13
.
5'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2017-08-04
Junio
C Hamano
Git 2
.
14
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-04
Ju
n
io C Hamano
M
e
rge
branch 'ah/patch-id-d
o
c'
commit
|
commitdiff
|
tree
2017-08-04
Junio C
Hamano
M
erge br
a
n
c
h
'
a
s
/diff-options-gr
a
mmofix'
commit
|
commitdiff
|
tree
2017-08-02
Junio C Hamano
Merge tag
'
l
1
0n-
2
.
14
.
0-rnd2'
o
f gi
t
://gi
t
h
ub
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2017-08-01
Junio C
Hamano
Git 2
.
13
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-08-01
J
unio C
H
amano
Merge tag 'v2
.
1
2
.
4
'
in
t
o maint
commit
|
commitdiff
|
tree
2017-08-01
Juni
o
C
Ham
a
n
o
S
y
nc wit
h
v
2
.
13
.
4
commit
|
commitdiff
|
tree
2017-08-01
J
u
nio C Hamano
Git 2
.
1
3
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-31
Junio
C
Hamano
S
yn
c
with maint
commit
|
commitdiff
|
tree
2017-07-31
J
u
n
i
o C Hamano
Pre
p
arat
i
on for 2
.
1
3
.
4 con
t
inue
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-31
Junio C Hamano
Me
r
ge
branch 'ks
/
doc-fi
x
e
s
' into maint
commit
|
commitdiff
|
tree
2017-07-31
Junio
C
H
amano
Merge br
a
nc
h
'jk/test-c
o
py-bytes-fix' into maint
commit
|
commitdiff
|
tree
2017-07-31
Junio C Hamano
M
e
rg
e
b
ranch
'p
w
/unquote-path-
i
n-git
-
pm' i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2017-07-31
Junio C Haman
o
Merg
e
branch 'j
k
/gc-pre-de
t
ach-under-hook' into ma
i
nt
commit
|
commitdiff
|
tree
2017-07-31
Juni
o
C Hamano
M
e
r
g
e branch '
j
n/hoo
k
s-pre-reba
s
e-sampl
e
-fix' into
.
.
.
commit
|
commitdiff
|
tree
2017-07-31
Junio C
H
a
man
o
Merge branch 'rs/progress-ove
r
all-th
r
oughput-at-th
e
.
.
.
commit
|
commitdiff
|
tree
2017-07-31
Junio C Hamano
Merge branch 'tb/push-to-cyg
w
in-
u
nc-p
a
th' i
n
to maint
commit
|
commitdiff
|
tree
2017-07-31
Junio C Hamano
Merge bran
c
h 'rs
/
apply-avoid-over-reading'
into maint
commit
|
commitdiff
|
tree
2017-07-31
Junio
C
Hamano
Mer
g
e bran
c
h 'js/blame-li
b
'
commit
|
commitdiff
|
tree
2017-07-31
Anthony Sottile
diff-options
doc: gra
m
mar
fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-30
Junio C H
a
mano
Git 2
.
12
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-30
Jun
i
o C Ha
m
ano
Merge
tag 'v2
.
11
.
3' into maint
-
2
.
12
commit
|
commitdiff
|
tree
2017-07-30
Juni
o
C H
a
mano
M
erge branch 'jk/lib-proto
-
disable-cle
a
nup' int
o
main
t
.
.
.
commit
|
commitdiff
|
tree
2017-07-30
Junio
C Hamano
Git 2
.
1
1
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-30
Junio C Hamano
M
e
rge tag 'v2
.
1
0
.
4' into maint-2
.
11
commit
|
commitdiff
|
tree
2017-07-30
Junio C Hamano
G
it 2
.
10
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-30
Junio C Ha
m
ano
Merge tag 'v2
.
9
.
5' into
m
a
int-2
.
10
commit
|
commitdiff
|
tree
2017-07-30
Juni
o
C Ham
a
no
Git 2
.
9
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-30
Jun
i
o C Ham
a
no
Merge tag 'v2
.
8
.
6'
into
maint-2
.
9
commit
|
commitdiff
|
tree
2017-07-30
Junio C Haman
o
G
i
t 2
.
8
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-30
Junio C Haman
o
Merge tag 'v2
.
7
.
6' in
t
o m
a
int-2
.
8
commit
|
commitdiff
|
tree
2017-07-30
Junio C Hamano
G
it 2
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-28
Junio C Hama
n
o
M
erge branc
h
'jk/ss
h
-funny-ur
l
'
int
o
maint-2
.
7
commit
|
commitdiff
|
tree
2017-07-28
Jeff
King
connect:
reject paths that loo
k
like
c
o
mmand
l
in
e
op
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-28
Jeff King
conne
c
t: reject dashed ar
g
uments for proxy commands
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-28
Jef
f
Kin
g
co
n
nect
:
factor out "looks like command line option
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-28
Je
f
f
K
i
n
g
t
5
813: add test for hostname s
t
ar
t
ing with dash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-28
Ju
n
i
o
C
H
amano
connect: r
e
ject ssh hostn
a
me that be
g
ins with
a dash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-28
Jef
f
Ki
n
g
t/lib-pr
o
t
o
-disable: r
e
store protocol
.
allow afte
r
c
o
nfig
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-28
An
d
rea
s
Heiduk
doc: remove uns
u
pported parameter from
p
a
t
ch-id
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-24
Junio C
Hamano
Git 2
.
14-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-24
SZEDER Gábor
blame
:
fi
x
memor
y
corruptio
n
s
crambling rev
i
sion
name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-24
Junio C Hamano
Merge htt
p
s://github
.
c
om
/
git-l10n/gi
t
-po
commit
|
commitdiff
|
tree
2017-07-21
Junio
C Hamano
Sync wit
h
m
a
i
nt
commit
|
commitdiff
|
tree
2017-07-21
J
unio C Hamano
f
i
x
es fro
m
'ma
s
ter' for 2
.
13
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-21
J
unio C Hamano
Mer
g
e bra
n
ch 'e
w
/fd-
c
loe
x
e
c
-fix' into maint
commit
|
commitdiff
|
tree
2017-07-21
Junio C
H
aman
o
Merge
b
ranch 'ks/fix-reba
s
e-doc-picture
'
into maint
commit
|
commitdiff
|
tree
2017-07-21
Junio C Ham
a
no
Merge bran
c
h 'js/alias-case-sensitivity'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2017-07-21
J
u
nio C Hamano
Merge branch '
b
b/un
i
code-1
0
.
0' into maint
commit
|
commitdiff
|
tree
2017-07-21
J
unio C Hama
n
o
Hopefull
y
the final la
s
t-m
i
nute fix before -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-21
Jun
i
o C Hamano
Merge branch 'ks/d
o
c-
f
ixes'
commit
|
commitdiff
|
tree
2017-07-21
Junio C Ha
m
a
no
Merge bra
n
ch 'rj/cygwin-fread-reads-direct
o
ries'
commit
|
commitdiff
|
tree
2017-07-21
Junio C Hamano
Merge
b
ran
c
h 'jc/po-pri
t
ime-fix'
commit
|
commitdiff
|
tree
2017-07-21
Ramsay Jones
config
.
mak
.
uname: set FREAD_READ
S
_DIRECTORIES
f
or
c
y
g
win
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-20
Junio
C
Hama
n
o
A f
e
w mo
r
e t
o
pics whil
e
wait
i
ng for
t
he po/
P
RItim
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-20
Junio C Hamano
M
e
r
ge br
a
nch '
m
t/p4-p
a
r
s
e-G-output'
commit
|
commitdiff
|
tree
2017-07-20
Juni
o
C
Hamano
Me
r
ge b
r
anc
h
'ew/fd-cloexe
c
-fix'
commit
|
commitdiff
|
tree
2017-07-20
Junio
C Hamano
Merge branch '
j
k/build-
w
ith-asan'
commit
|
commitdiff
|
tree
2017-07-20
J
u
nio C Hamano
Merge
branc
h
'
j
k/tes
t
-c
o
py-byte
s
-fix'
commit
|
commitdiff
|
tree
2017-07-20
J
u
nio C
H
amano
Merge branch 'js/alia
s
-case-s
e
n
s
itivity'
commit
|
commitdiff
|
tree
2017-07-20
Æ
v
ar Arnfj
ö
rð Bjarmason
Rel
N
o
t
es: mention "sha1dc: optionally use sha1collisiondetec
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-20
Ævar Ar
n
f
j
örð B
j
armason
RelNotes: mention "log: mak
e
--regexp-igno
r
e-case work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-20
Ævar
Arnf
j
örð
Bjarmaso
n
RelNotes: mention "
l
og: add -P as
a
s
y
n
o
nym for --
p
erl
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-20
J
u
ni
o
C Ham
a
no
Makefile: help gettext
tools to c
o
pe
w
ith our custom
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-18
Kaartic Sivaraam
doc:
r
eformat t
h
e
paragraph contain
i
ng the 'cut-line'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-18
Junio C
H
a
m
ano
A
f
ew mor
e
topics before 2
.
14-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-18
Junio C
H
amano
M
e
rge b
r
a
nc
h
'
j
k/g
c
-pre-
d
etach-under-
h
ook
'
commit
|
commitdiff
|
tree
2017-07-18
Junio
C
H
amano
M
erge br
a
nch 'jn/hooks
-
pre-rebase-s
a
mp
l
e
-
fix'
commit
|
commitdiff
|
tree
2017-07-18
Junio C Hamano
Me
r
g
e
bra
n
ch '
r
s/progres
s
-overall-throughput-at-the
.
.
.
commit
|
commitdiff
|
tree
2017-07-18
Junio C Hamano
M
e
rge branch 'tb/push-to-
c
ygwin-unc-path'
commit
|
commitdiff
|
tree
2017-07-17
Kaartic Sivaraam
doc: camelCase
t
he i18
n
config v
a
riabl
e
s
t
o
impr
o
v
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-17
Je
f
f Ki
n
g
t: handle E
O
F in test_c
o
p
y
_byt
e
s()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-17
Eric Wong
set
FD_CLOEXEC properly when O_CLOEXE
C
is not supported
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-17
Re
n
é Scharfe
M
a
kef
i
l
e
:
a
l
lo
w
c
om
b
ining UBSan with ot
h
er sanitiz
e
rs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-17
Johannes
S
chindelin
alias
:
compa
r
e alias name *ca
s
e
-insensiti
v
ely*
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-17
J
ohannes Schindelin
t1300: de
m
onstra
t
e
that Cam
e
lCa
s
ed a
l
i
ases r
e
g
r
essed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-13
Junio C Ham
a
no
Git 2
.
14-rc
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-13
Junio C Hamano
Merge branch 'jk/buil
d
-with-
a
san'
commit
|
commitdiff
|
tree
2017-07-13
Junio
C
H
am
a
no
Merge branch 'sb/pull-reb
a
se-su
b
m
odule'
commit
|
commitdiff
|
tree
2017-07-13
J
u
n
io C Hamano
M
erge branch 'sb/hashmap-customize-com
p
a
r
ison'
commit
|
commitdiff
|
tree
2017-07-13
Junio C Hamano
Mer
g
e branch 'ab/grep-lose-opt-regfl
a
g
s
'
commit
|
commitdiff
|
tree
2017-07-13
Miguel Torroja
gi
t
-p4: filt
e
r f
o
r {'cod
e
':'info'}
in p4CmdList
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-13
Miguel Torroja
git-p4
:
p
arse marshal output "p4 -G" in
p
4 changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-13
M
iguel Tor
r
oj
a
gi
t
-p4: git-p4 tests
with p4 trig
g
e
rs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-12
J
u
nio C Hamano
Sync with v2
.
13
.
3
commit
|
commitdiff
|
tree
2017-07-12
Junio C Hamano
G
i
t 2
.
1
3
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-12
Junio C Hamano
Merge b
r
anch 'k
n
/ref-fi
l
ter-br
a
nch-list' into
m
a
int
commit
|
commitdiff
|
tree
2017-07-12
Junio C Hamano
Merge branch 'ks/typofix-com
m
it-c-c
o
mment'
i
n
to mai
n
t
commit
|
commitdiff
|
tree
2017-07-12
Junio C Hamano
M
erge bran
c
h '
j
k
/reflog
-
walk-m
a
int' int
o
maint
commit
|
commitdiff
|
tree
2017-07-12
J
u
nio C Ham
a
n
o
Hopefully the last
b
at
c
h
b
efore -rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-07-12
Juni
o
C Hamano
Merge b
r
a
nch 'ks/
f
ix-reb
a
se-doc-
p
ictur
e
'
commit
|
commitdiff
|
tree
2017-07-12
Junio C H
a
mano
Merge branch 'rs/wt
-
status-cleanup'
commit
|
commitdiff
|
tree
2017-07-12
Junio C
Hamano
M
e
rge branch 'r
s
/us
e
-div-roun
d
-
up'
commit
|
commitdiff
|
tree
2017-07-12
Ju
n
io C
H
amano
M
er
g
e bran
c
h
'kn/
r
ef-filter-branch
-
lis
t
'
commit
|
commitdiff
|
tree
next