repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rerere: add documentation for conflict normalization
2018-08-06
Thomas
G
ummerer
rerere:
a
dd documentat
i
on for conf
l
i
c
t
n
orma
l
iz
a
tion
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-08-06
Thom
a
s Gummere
r
rerere: mark str
i
n
g
s for
transla
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-07-16
T
homa
s
Gummerer
r
e
rere: wrap paths in outpu
t
i
n
sq
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-07-16
T
h
omas Gummerer
r
erere: lowerca
s
e err
o
r
m
essage
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-07-16
Thomas Gum
m
erer
rere
r
e
: unify error messages when
r
ead_cache fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-28
J
u
nio C
Hama
n
o
Second batch for
2
.
19 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-28
Juni
o
C
H
amano
Me
r
ge b
r
anch '
s
b/fix
-
fetching
-
moved
-
submo
d
ules'
commit
|
commitdiff
|
tree
2018-06-28
Junio C H
a
m
a
n
o
M
er
g
e branch 't
z
/cred
-
netrc-cleanup
'
commit
|
commitdiff
|
tree
2018-06-28
Junio
C
Hamano
Merge
b
ranch 'jc/clean-afte
r
-
sa
n
ity-tests'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hamano
Mer
g
e bra
n
ch 'n
d
/completion-neg
a
tion
'
commit
|
commitdiff
|
tree
2018-06-28
J
u
nio C H
a
mano
Merge branch 'pw/add
-
p-rec
o
unt'
commit
|
commitdiff
|
tree
2018-06-28
Juni
o
C
H
a
m
ano
Merge
b
ranch 'jk/fetch-all-peeled-fix'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hamano
Merge
branch
'
ms/send-pack-ho
n
or-c
o
nfig'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hamano
M
erg
e
branch
'
jh/partial-cl
o
n
e
'
commit
|
commitdiff
|
tree
2018-06-28
J
u
n
i
o
C H
a
mano
M
erge
b
r
anch 's
g
/gpg-tests-fix'
commit
|
commitdiff
|
tree
2018-06-28
J
unio C Hamano
M
erge br
a
n
c
h
'as/safe
c
rlf-quiet-fi
x
'
commit
|
commitdiff
|
tree
2018-06-28
Junio
C Hamano
Merge b
r
anch 'ab/
r
efspec-init-fi
x
'
commit
|
commitdiff
|
tree
2018-06-25
Juni
o
C Hamano
First batch for 2
.
19 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-25
Junio C
H
amano
Merge
branch
'
sb/plug
-
m
isc-leaks'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Merge br
a
nch 'cc/tests
-
without-assuming-r
e
f-f
i
les-backend'
commit
|
commitdiff
|
tree
2018-06-25
Junio C
H
a
m
an
o
Merge
branch
'sg/update-ref-stdin-cleanup'
commit
|
commitdiff
|
tree
2018-06-25
Junio
C Hama
n
o
Me
r
ge branch 'nd/reject
-
empty-shallow-request'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Mer
g
e
branc
h
'ls/complete-
r
emote-u
p
d
ate-names'
commit
|
commitdiff
|
tree
2018-06-25
Ju
n
i
o
C
Hama
n
o
Merge
branch 'ag/rebase-p
'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Merge branch 'nd/complete-config-var
s
'
commit
|
commitdiff
|
tree
2018-06-25
Jun
i
o
C
Hamano
M
e
r
ge bra
n
c
h
'sb/
o
bj
e
ct-store-all
o
c'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Merg
e
branch 'jk/show-index'
commit
|
commitdiff
|
tree
2018-06-25
Junio C
Hamano
Merge
branch 'e
n
/merge-recurs
i
ve-tests'
commit
|
commitdiff
|
tree
2018-06-25
Jun
i
o C H
a
mano
Merge branch 'nd/diff-app
l
y-it
a
'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
M
e
rge branc
h
'ds
/
commit-gr
a
ph-lockfile-fi
x
'
commit
|
commitdiff
|
tree
2018-06-25
J
unio
C
Hamano
Mer
g
e bran
c
h
'nd/commit-util-to-s
l
ab'
commit
|
commitdiff
|
tree
2018-06-25
Junio
C Ha
m
an
o
Merge
b
ranch 'pc/submodule-h
e
lper-for
e
ach'
commit
|
commitdiff
|
tree
2018-06-25
Ju
n
io C Ha
m
ano
Prep
a
re to start
2
.
19 c
y
cle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-25
Stefan Beller
seque
n
cer
.
c: plu
g
mem leak in git_seq
u
encer_config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-21
Junio
C
Haman
o
Git 2
.
18
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-19
Junio
C
Hamano
Merge branch 'en/rename-dire
c
tory
-
detection-
r
eboo
t
'
commit
|
commitdiff
|
tree
2018-06-19
Junio C Haman
o
Merge tag 'l10n-2
.
1
8
.
0-rnd3
.
1' of
g
it://git
h
ub
.
com
.
.
.
commit
|
commitdiff
|
tree
2018-06-19
J
u
nio
C Hamano
Merge bra
n
c
h
'cf/s
u
b
m
odule-progre
s
s-
d
is
s
ociate'
commit
|
commitdiff
|
tree
2018-06-19
Junio C Hamano
Merge br
a
nch 'js/reba
s
e
-i-root-fix'
commit
|
commitdiff
|
tree
2018-06-19
Stefan Beller
t7400: encapsula
t
e setup code in test_ex
p
ect_
s
ucc
e
s
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-19
T
o
dd Zul
l
inger
t3
4
0
4: check root c
o
mmit in 'rebase -i --
r
oot reword
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-19
K
a
rthikeyan Singaravelan
doc: fix typos in documentation and release notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
T
o
dd Z
u
llinger
git-creden
t
ial-netrc: make
"
all" default target o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
J
unio
C
Hamano
Almost 2
.
18 final
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Juni
o
C Hamano
Merge bra
n
c
h '
e
s/make-no-iconv'
commit
|
commitdiff
|
tree
2018-06-18
Junio C
Ham
a
no
Merge
branch
'
sg/t7406-chain-fix
'
commit
|
commitdiff
|
tree
2018-06-18
Juni
o
C
Hamano
Mer
g
e branch 'k
s
/branch-s
e
t-upst
r
eam'
commit
|
commitdiff
|
tree
2018-06-18
Junio C
H
aman
o
Merge b
r
a
n
c
h
'js/rebase-i-root-fix'
commit
|
commitdiff
|
tree
2018-06-18
J
unio C Hamano
Merge branch
'
j
k
/ew
a
h-bounds-ch
e
c
k'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Ha
m
ano
Merge tag '
l
10
n
-2
.
18
.
0-rnd3' of git://git
h
u
b
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2018-06-18
Junio C H
a
mano
A
b
un
c
h of mi
c
ro-f
i
xes be
f
ore
going 2
.
18 final
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Junio
C Hamano
Merge branch 's
b
/blame-color'
commit
|
commitdiff
|
tree
2018-06-18
Ju
n
io C Hama
n
o
Merge branch
'
mw/doc
-
m
e
r
ge-enumfix
'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
M
erge
b
ranch 'en/rename-dir
e
c
t
ory-d
e
tection'
commit
|
commitdiff
|
tree
2018-06-18
Juni
o
C
Hamano
Merge branch 'rd/doc-remote-tracking-with-
h
yphen'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge
br
a
nch 'jl/zlib-r
e
store-nul-terminatio
n
'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge branch 'ab/
c
re
d
-
netrc-no-aut
o
die'
commit
|
commitdiff
|
tree
2018-06-18
J
u
nio C Hamano
Merge branch 'km/doc-workflow
s
-
ty
p
of
i
x'
commit
|
commitdiff
|
tree
2018-06-18
Juni
o
C Hamano
Mer
g
e branch '
l
d/
g
i
t-p4-up
d
a
t
es'
commit
|
commitdiff
|
tree
2018-06-18
J
u
nio C Hama
n
o
Merge br
a
n
c
h 'rd/diff-options-typofix'
commit
|
commitdiff
|
tree
2018-06-18
J
unio
C Hamano
Merge
branch '
r
d
/comm
e
nt-typ
o
fix-in-sha
1
-file'
commit
|
commitdiff
|
tree
2018-06-18
R
en
é
Schar
f
e
me
r
ge-recursive: use xstrdup() instead of fixed buff
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
SZE
D
ER Gábor
RelNotes 2
.
18: mi
n
or fix t
o
e
n
try about dy
n
a
mi
c
ally
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
S
Z
ED
E
R Gábor
t7406-s
u
bm
o
dule-up
d
at
e
:
fix bro
k
en &&-chains
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
J
ohannes Schin
d
elin
rebase --root: fix amending r
o
ot commi
t
messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Tod
d
Zullinger
rebase --root:
d
emonstra
t
e a bug
w
h
i
le amending r
o
ot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Jeff Ki
n
g
ewa
h
: adjust calle
r
s of
ewa
h
_read_mmap()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Jeff
King
ewah
_
read
_
mmap: bounds-chec
k
mmap reads
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
K
a
a
r
ti
c
S
i
varaam
t3200:
c
lar
i
fy des
c
ription o
f
--set-ups
t
rea
m
test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Luis Mar
s
an
o
git-crede
n
tia
l
-ne
t
rc: fix exit statu
s
wh
e
n tests fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Luis Marsan
o
g
i
t
-
creden
t
ial
-
netrc: u
s
e in-tree Git
.
pm for test
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Todd Zullinger
g
i
t-cre
d
e
ntial-netr
c
: min
o
r whitespace
cleanup
i
n test
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-15
Eric Su
n
s
h
ine
Makefil
e
: make NO_ICONV really mean "
n
o iconv"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-15
J
u
nio C Hamano
tests: c
l
ean after
S
ANITY te
s
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
Stefa
n
Bell
e
r
t5526
:
test
recursive submodules when fetching moved
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
Stefa
n
Bel
l
er
submodul
e
: fix NULL corre
c
tn
e
ss in
r
e
named
b
roken submodules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
Meng-Sung Wu
doc: update th
e
o
r
d
e
r of
the syntax `git merge
-
-
continue`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
René Scharfe
bl
a
m
e: release
s
tring_list after use in parse_c
o
lor_
f
ields()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
René Scharfe
merge-recursive: use xstr
d
up(
)
instead of fixe
d
buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
J
u
n
i
o C Ham
a
n
o
Git 2
.
18-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Junio C Hamano
M
e
rge b
r
anch '
j
k/i
n
d
e
x-pack-m
a
int'
commit
|
commitdiff
|
tree
2018-06-13
Junio C H
a
ma
n
o
Mer
g
e bra
n
ch 'sg/completion-zsh
-
workarou
n
d'
commit
|
commitdiff
|
tree
2018-06-13
Jun
i
o C Ham
a
no
Merge branch
'
sb
/
sub
m
odule-merge-in-merge-recursive'
commit
|
commitdiff
|
tree
2018-06-13
Junio C Ham
a
no
Merg
e
b
ranch 'jk/submodule-fsck-loose-fixu
p
'
commit
|
commitdiff
|
tree
2018-06-13
Kirill S
m
e
lk
o
v
fetch-
p
ack: test
e
x
plicitly that --all can fetc
h
tag
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Jeremy Linton
pac
k
file: correct
z
l
ib buffer ha
n
dling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
El
i
j
ah N
e
wren
RelNotes 2
.
18: c
l
arify where dire
c
tory rename
d
etection
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Robert P
.
J
.
D
ay
U
s
e hyph
e
nated "re
m
o
t
e-
t
racki
n
g
bra
n
ch
"
(docs and
c
ommen
t
s)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Æva
r
Arnfjörð Bjar
m
ason
git-credential-netrc: remove use of
"
au
t
odie"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke Diam
a
nd
git-p4:
a
u
to-siz
e
th
e
block
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke Di
a
mand
git-p4: narrow the
s
cope of exceptions caught
when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke
D
iamand
git-p4: raise exceptions fro
m
p4CmdList bas
e
d on
error
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luk
e
Dia
m
and
g
it-p4: better
e
rror
reporting
when
p
4 fai
l
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke Diamand
g
it-
p
4
: a
d
d option
t
o disable sync
i
n
g of p4/mas
t
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke Diam
a
nd
git
-
p4: disable-reba
s
e:
a
l
low setting this
v
i
a
configurat
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
R
omain
Merland
git-p4: a
d
d op
t
ions
-
-
commit and --di
s
able-re
b
ase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
M
a
saya Su
z
uki
b
u
ilti
n
/
s
e
nd
-
pack: populate the default configs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Jonathan Tan
list-objects:
check if filter is NULL before using
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Kyle
Meyer
g
itworkflows: fix
g
rammar in
'
Merge upward
s
' rule
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
SZEDER G
á
b
o
r
completion: c
o
r
r
e
ct zsh detectio
n
when run from git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next