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
rebase --rebase-merges: adjust man page for octopus support
2018-07-11
Johannes
S
c
hindelin
rebase --re
b
a
s
e
-
merge
s
:
adj
u
st man page
for octopus
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-07-11
J
ohannes
S
chindelin
r
e
b
ase
--rebase-mer
g
es: add support for octopus merges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-07-11
Johannes Sch
i
nd
e
lin
merge
:
allow rea
d
ing the m
e
rge commit message from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hamano
Second batch for 2
.
19 cy
c
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-28
Junio
C
Hamano
Merge branch 'sb/
f
ix-fetching-m
o
ved
-
subm
o
dules'
commit
|
commitdiff
|
tree
2018-06-28
Jun
i
o
C
Hamano
Merg
e
branch
'tz
/
cred-net
r
c-c
l
e
a
nup'
commit
|
commitdiff
|
tree
2018-06-28
J
unio
C
Hamano
Merg
e
branch
'j
c
/
c
lean-after-sanity
-
test
s
'
commit
|
commitdiff
|
tree
2018-06-28
Jun
i
o
C Hama
n
o
Merg
e
bran
c
h
'nd/complet
i
on-negation'
commit
|
commitdiff
|
tree
2018-06-28
J
unio C Hamano
Mer
g
e branch 'pw/add-p
-
rec
o
unt'
commit
|
commitdiff
|
tree
2018-06-28
Junio
C Ham
a
no
Me
r
ge branc
h
'
j
k/fetch
-
all-peele
d
-
fix
'
commit
|
commitdiff
|
tree
2018-06-28
Jun
i
o C Ham
a
no
M
e
rge bra
n
ch 'm
s
/
s
e
nd-
p
ack-hono
r
-con
f
ig'
commit
|
commitdiff
|
tree
2018-06-28
Jun
i
o C Hamano
Me
r
ge bra
n
c
h
'jh/partial-clo
n
e'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hamano
Merge bran
c
h 'sg/gpg-t
e
sts-fix'
commit
|
commitdiff
|
tree
2018-06-28
J
u
nio C Haman
o
M
erge bra
n
ch 'as/safecrlf-quiet
-
fix'
commit
|
commitdiff
|
tree
2018-06-28
Junio C H
a
ma
n
o
Merge branc
h
'ab
/
refs
p
ec-init-fix'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Fir
s
t
b
atch
f
or 2
.
19 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-25
Junio
C
Haman
o
Merg
e
branch 'sb/plug-mi
s
c-leaks'
commit
|
commitdiff
|
tree
2018-06-25
J
u
n
i
o C Hamano
Merge branch 'cc/tests-with
o
ut
-
a
s
s
uming-r
e
f-files-backend'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Ham
a
no
Merge branch 'sg/update-ref-st
d
in-cleanu
p
'
commit
|
commitdiff
|
tree
2018-06-25
Ju
n
i
o
C
Ha
m
ano
Merge br
a
nch 'nd/reject-e
m
pt
y
-shal
l
o
w
-
request'
commit
|
commitdiff
|
tree
2018-06-25
Junio C
H
a
m
ano
Merge b
r
anch
'
ls/complete-remote-update-names'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Mer
g
e bran
c
h 'ag/rebase-p'
commit
|
commitdiff
|
tree
2018-06-25
J
unio C Hama
n
o
Merge bran
c
h 'nd/c
o
mplete-config-
v
ars'
commit
|
commitdiff
|
tree
2018-06-25
J
u
ni
o
C
Hamano
Merge
branch 's
b
/object-stor
e
-
alloc'
commit
|
commitdiff
|
tree
2018-06-25
Junio C
H
a
mano
Mer
g
e br
a
nch 'jk/show-index'
commit
|
commitdiff
|
tree
2018-06-25
J
u
ni
o
C Hamano
Merge branch 'en/mer
g
e-recurs
i
ve-tests'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
M
e
rge branch 'nd/diff-apply-ita'
commit
|
commitdiff
|
tree
2018-06-25
Ju
n
io C Hamano
Merge
branch 'ds/co
m
mit-graph-lockf
i
le-fi
x
'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Merge branch
'nd/commit-util-
t
o-slab'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Merge branc
h
'pc/submodule-help
e
r-foreach'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Prepare to start 2
.
1
9
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-25
Stefan
Belle
r
se
q
uen
c
er
.
c
:
plug mem leak in git_s
e
quencer_config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-21
Ju
n
io C Ha
m
ano
Git 2
.
1
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-19
Junio C
Ha
m
ano
Merge branch 'en
/
rename-directo
r
y
-
detection-r
e
boot'
commit
|
commitdiff
|
tree
2018-06-19
Junio C Ha
m
ano
Me
r
ge
t
ag 'l10n-2
.
18
.
0-rnd3
.
1' o
f
git://githu
b
.
c
om
.
.
.
commit
|
commitdiff
|
tree
2018-06-19
Junio C Hamano
M
e
rge branch 'cf/submodul
e
-
p
ro
g
r
e
ss-dissociate
'
commit
|
commitdiff
|
tree
2018-06-19
Junio
C
Ha
m
a
n
o
Merge bra
n
c
h
'js/rebase-i-root-
f
i
x'
commit
|
commitdiff
|
tree
2018-06-19
Stefan Be
l
l
e
r
t
7
400:
encapsula
t
e setup code
i
n test_expect_success
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-19
To
d
d
Z
ulling
e
r
t3
4
04: ch
e
ck
root commit in 'rebase -i
-
-roo
t
reword
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-19
Karthik
e
yan Si
n
garav
e
lan
d
o
c
:
fix typos in documentation a
n
d
release notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Todd Zu
l
linger
git-credential
-
netrc: make "all
"
d
efault t
a
rget of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
J
uni
o
C H
a
m
ano
Almost 2
.
1
8 final
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Junio
C
H
a
mano
Merge branch 'es/make-no
-
ico
n
v
'
commit
|
commitdiff
|
tree
2018-06-18
Juni
o
C Hamano
Merge b
r
a
n
ch 'sg/t
7
406
-
chain-fix'
commit
|
commitdiff
|
tree
2018-06-18
Ju
n
io C Haman
o
Merge branch 'ks/branch-set-up
s
tream'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merg
e
bra
n
ch 'j
s
/rebase
-
i-root
-
fix'
commit
|
commitdiff
|
tree
2018-06-18
J
unio C Hamano
Me
r
ge b
r
anch 'jk
/
ewah-bounds-check
'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge ta
g
'l
1
0n
-
2
.
18
.
0-rnd3' of git:/
/
g
i
t
h
ub
.
com
/
git
.
.
.
commit
|
commitdiff
|
tree
2018-06-18
Junio C Ham
a
n
o
A bu
n
ch
o
f
m
icro
-
fi
x
es before goi
n
g 2
.
18 fina
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge branch 'sb/blam
e
-col
o
r'
commit
|
commitdiff
|
tree
2018-06-18
Juni
o
C Hamano
Merg
e
branch 'mw/doc-merge-enum
f
ix'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge branch 'en/rename-directory-detection'
commit
|
commitdiff
|
tree
2018-06-18
Ju
n
io C Hamano
Merge b
r
anc
h
'rd/d
o
c
-remote-tracking-w
i
th-hyphen'
commit
|
commitdiff
|
tree
2018-06-18
Junio C
Ha
m
ano
Merge bran
c
h 'j
l
/zlib-resto
r
e-nul-terminatio
n
'
commit
|
commitdiff
|
tree
2018-06-18
Juni
o
C Hamano
M
erge branch 'ab/cred-netrc-no-au
t
o
d
ie'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge branch
'
km/doc-w
o
rkflow
s
-typ
o
fix'
commit
|
commitdiff
|
tree
2018-06-18
Jun
i
o C Ham
a
no
M
e
r
g
e branch 'ld/git-p4-up
d
ates'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge
branch 'r
d
/diff-
o
p
t
ions-typof
i
x'
commit
|
commitdiff
|
tree
2018-06-18
Jun
i
o C H
a
mano
Merge branch
'
rd
/
com
m
ent-typofi
x
-in-
s
ha1
-
file'
commit
|
commitdiff
|
tree
2018-06-18
René Scharfe
me
r
ge-recursiv
e
: use xstrdup() inst
e
ad
o
f
fixed buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
SZE
D
ER Gábo
r
RelNotes 2
.
18: minor f
i
x
to entry about dynamical
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
SZE
D
ER Gá
b
or
t7406-submodule-update: fix
b
r
oken
&
&-chai
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
J
o
hannes
S
chin
d
elin
r
e
base --ro
o
t: fix amendi
n
g root commit
m
essages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Tod
d
Zullinger
r
e
base --root: demonst
r
ate a
bu
g
w
h
ile amend
i
n
g
r
oot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Jeff King
ewah: adjust
callers of ewah_read_mmap()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
J
eff King
ewa
h
_read_mmap: bounds-check mmap reads
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Ka
a
rti
c
Si
v
a
r
a
am
t3200: clarify descrip
t
ion of --set-upst
r
ea
m
test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
L
uis Marsa
n
o
git-c
r
edential-
n
e
trc:
f
ix exit status
w
h
en tests fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Luis Marsano
git-credent
i
al-netrc: use in-tree G
i
t
.
pm for t
e
st
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
T
o
d
d Zu
l
linger
g
it-credential-netrc: minor whitespace cleanup in test
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-15
E
ric Sunshine
Ma
k
efile: m
a
ke NO_ICONV r
e
ally mean "no iconv"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-15
Junio C Haman
o
tests
:
cl
e
an
aft
e
r
SAN
I
TY tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
Stefan Bell
e
r
t5526:
t
e
st recurs
i
ve submodul
e
s when fetch
i
ng mo
v
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
Stefan
Belle
r
submodule:
f
ix NULL corre
c
tness in rename
d
brok
e
n
submodules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
Meng-Sung Wu
doc: updat
e
th
e
order of the
s
yntax
`
g
it merge
-
-continue`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
Ren
é
Scharfe
blame: release
string_list a
f
ter use in parse_color_fields()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
René
S
charfe
mer
g
e-recurs
i
ve: us
e
xstrdup()
instead
o
f
fixed
buf
f
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Junio C H
a
mano
Git 2
.
18-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Junio C
Ham
a
no
Merge branch 'jk/index-
p
ack
-
maint'
commit
|
commitdiff
|
tree
2018-06-13
Junio C
H
amano
Merge br
a
nch '
s
g
/co
m
pletion-zsh-workaround'
commit
|
commitdiff
|
tree
2018-06-13
Junio C Hamano
Merge br
a
n
c
h
'sb/submodul
e
-
m
erge-in-merge-recursive'
commit
|
commitdiff
|
tree
2018-06-13
Junio
C
H
a
m
a
no
M
e
rg
e
branch 'jk/submodule-fsck-loose-fixup'
commit
|
commitdiff
|
tree
2018-06-13
Kiri
l
l Smelkov
fetch-pack:
test e
x
plicit
l
y
th
a
t --all
c
an fetch tag
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
J
e
remy Lint
o
n
p
a
ckf
i
le: correc
t
zlib
b
u
f
f
e
r
h
andling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
E
l
i
j
ah Newren
R
elNote
s
2
.
18: clar
i
fy wher
e
di
r
ectory
rename detec
t
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
R
o
ber
t
P
.
J
.
Day
Use
h
yphenated "re
m
ote-tracking branch
"
(docs and comments)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Ævar A
r
nfjörð Bja
r
mason
git-c
r
e
d
e
ntial-netrc: remove use of
"auto
d
ie"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
L
uke Di
a
ma
n
d
gi
t
-p4:
a
uto-
s
ize the block
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
L
u
k
e
Diama
n
d
git-p4: narrow the sco
p
e of e
x
ception
s
cau
g
h
t
w
hen
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Lu
k
e Diamand
git-p4: raise
exceptions fr
o
m p4Cmd
L
i
s
t ba
s
ed on error
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luk
e
Diamand
git-p4: b
e
tte
r
error reporti
n
g w
h
en p4
fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luk
e
Diam
a
nd
git-p4: a
d
d
option
to disable syncing of
p4/master
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Lu
k
e
Diamand
git-p
4
: disable-rebase: allow se
t
ting this via configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
R
om
a
i
n
Merland
git-p4: add
o
p
t
ions --commit and
--disabl
e
-rebase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Masaya Suzuki
builtin/
s
e
n
d-pack
:
populate th
e
d
efault configs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
J
o
nat
h
an Tan
list-obj
e
cts:
check if
f
ilte
r
is NULL before using
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
K
yle Meyer
gitworkflows: fix
gra
m
mar in 'Merge upwa
r
ds' rule
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
S
Z
EDER Gábor
co
m
pletion: c
o
rrect z
s
h detection when run from git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-11
Juni
o
C Haman
o
i
ndex-pack: corr
e
c
t
install_packe
d
_git() args
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-11
Robert P
.
J
.
D
a
y
diff
-
o
p
tions
.
t
xt: fix minor typos
,
fo
n
t inconsistencies
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next