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
ll-merge: use a longer conflict marker for internal merge
2016-05-09
Junio C Hamano
ll-mer
g
e
:
u
s
e
a
longer
c
onfl
i
ct ma
r
k
e
r for
i
nternal
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2016-04-14
Junio C Hamano
l
l
-m
e
r
g
e
:
fix typo
i
n comment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
Git 2
.
3
.
8
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Ha
m
ano
Merg
e
branch 'mm
/
usage-log-l-can-take-regex'
i
n
to maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Ham
a
no
Merge branch 'jc/diff-no-index-d-f' into mai
n
t-
2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
Mer
g
e
b
ranch 'o
h
/fix-config-de
f
ault-u
s
er-name-sectio
n
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
J
un
i
o C
Hama
n
o
M
erge
b
ran
c
h 'j
c
/
e
pochti
m
e-wo-tz' in
t
o
m
aint-2
.
3
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Git 2
.
3
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-27
Junio
C
Haman
o
Merge
b
r
a
nch 'tb/connect-ipv6-parse
-
fix' i
n
to maint
commit
|
commitdiff
|
tree
2015-04-27
Junio C Hamano
Merge
branch 'ma/bash-
c
omplet
i
on-l
e
a
k
i
n
g
-x
'
i
n
t
o ma
i
n
t
commit
|
commitdiff
|
tree
2015-04-27
J
u
n
i
o C Ham
a
no
Merge
b
ran
c
h 'jc/pus
h
-c
e
rt' int
o
m
a
int
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Git 2
.
3
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge br
a
nc
h
'jk/c
o
lor
s
' into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio
C H
a
mano
Merge branch 'jk/t
e
st-annoyance
s
' into maint
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
i
o
C Hamano
Merge branch
'
p
t
/
enter-repo-comme
n
t-fix' into maint
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hama
n
o
Merge branch 'jz
/
gitweb-conf-doc-fix' i
n
to main
t
commit
|
commitdiff
|
tree
2015-04-21
Ju
n
io C
Ham
a
no
Merge
branch 'j
k
/
c
he
r
r
y
-pick-doc
f
ix
'
into maint
commit
|
commitdiff
|
tree
2015-04-21
Jun
i
o C H
a
mano
Merge br
a
nch 'i
u
/fix-pa
r
se-options-h-
c
omment' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C
H
amano
Merge
bran
c
h
'jg/cguide-we-cann
o
t-count' into
main
t
commit
|
commitdiff
|
tree
2015-04-21
J
unio C Hamano
Me
r
ge branch
'jk
/
pac
k
-
c
orruptio
n
-
po
s
t-
m
or
t
em
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-04-21
Junio C Hamano
Merge branch 'jn/
d
oc-fast-
i
mpo
r
t-no-1
6
-octopu
s
-
l
imit
.
.
.
commit
|
commitdiff
|
tree
2015-04-20
Matthieu Moy
log
-
L: improve error me
s
sage on
m
alfo
r
med a
r
gument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-20
Ma
t
thieu Moy
D
o
cumentation: change -
L
:<regex> to -L
:
<funcname>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-17
Ossi Herrala
c
onfig: f
i
x settin
g
s
i
n
defau
l
t_user_config te
m
p
l
ate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-15
Junio C Hamano
parse_date_basic(): let the system
h
andle
D
ST con
v
ersion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-15
Junio C H
a
mano
parse_dat
e
_basic(): return early whe
n
given a bogus
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-14
Ju
l
ian
G
indi
Coding
G
uidelines: update
'rough
'
rule count
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-13
Márcio Almada
com
p
le
t
io
n
: fix global b
a
s
h vari
a
ble leak on __gi
t
c
o
mpap
p
en
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-09
Torsten Bögershausen
connect
.
c: i
g
n
ore extra co
l
on after hostname
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-04
K
yle J
.
M
cKay
di
f
f
-highlight: do not
spl
i
t
multib
y
t
e
c
haract
e
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-02
Junio
C Hamano
push --signed: tig
h
ten wha
t
the
receivin
g
e
n
d
can ask
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-02
Jeff King
howto: docume
n
t more tools
f
or recovery corruption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-04-01
Jonathan Ni
e
der
fa
s
t
-import doc: remov
e
suggested 16
-
par
e
nt limit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-31
Juni
o
C Hamano
Git 2
.
3
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-31
Junio C Ham
a
no
Me
r
ge branch 'ss
/
pull-rebase-preserve' int
o
maint
commit
|
commitdiff
|
tree
2015-03-31
Junio C Hamano
M
erge b
r
anch 'jc/report-pa
t
h-error
-
to-dir'
i
n
t
o
m
aint
commit
|
commitdiff
|
tree
2015-03-31
Junio C Haman
o
Merge branch 'ph/
p
u
s
h
-
d
oc-cas' into
m
a
int
commit
|
commitdiff
|
tree
2015-03-31
J
é
rôme Zago
gitweb
.
con
f
.
txt: s
a
y "buil
d
-t
i
me",
n
ot "b
u
ilt-time"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-31
Pau
l
T
a
n
enter_repo
(
): fix
d
ocs to match code
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-31
Jeff King
cherry-
p
ick: fix docs d
e
s
cribing handling o
f
empty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-30
Sebastian
S
c
h
uberth
docs: clari
f
y what git-rebase
'
s "-p" / "--pres
e
rve
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-30
Iv
a
n Ukhov
parse-options
.
h: OPTION_{BIT,SET_I
N
T} do not store
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
P
repare for 2
.
3
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-28
Junio C Haman
o
Merge
br
a
n
ch 's
g
/completi
o
n-gitco
m
p-nl-for-refs' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
J
u
n
io C
Ha
m
a
n
o
Me
r
g
e
b
r
anc
h
'jk/simplify-cs
u
m-f
i
le
-
s
ha1fd-ch
e
ck' into
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Jun
i
o C Hamano
Merge bran
c
h 'tg/test-index-v
4
' into maint
commit
|
commitdiff
|
tree
2015-03-28
J
u
nio C Hamano
Merge b
r
an
c
h 'nd/doc-git
-
index-versi
o
n
' into
m
a
int
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge br
a
nch 'ct/promp
t
-untracked-fix' in
t
o maint
commit
|
commitdiff
|
tree
2015-03-28
Ju
n
io C
H
amano
M
erge b
r
a
n
ch 'ws/gre
p
-quiet
-
no
-
p
a
ger'
into maint
commit
|
commitdiff
|
tree
2015-03-28
J
u
nio C
H
amano
Merge
b
ranch 'j
c
/submitting-patches-
m
e
ntion-send-email
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
J
u
n
i
o C
Ham
a
no
Merge branch 'jk/c
l
eanup-faile
d
-clone' into main
t
commit
|
commitdiff
|
tree
2015-03-28
Junio C Hamano
Merge
b
ranc
h
'jk/fe
t
ch-pack' into m
a
i
nt
commit
|
commitdiff
|
tree
2015-03-28
J
unio C Hamano
Merge branc
h
'tg/fix
-
check
-
order-with
-
split-index'
.
.
.
commit
|
commitdiff
|
tree
2015-03-28
Ju
n
io
C
Hamano
Merge branch
'
jk/prune-with-corrupt-refs'
into maint
commit
|
commitdiff
|
tree
2015-03-28
Thoma
s
Ackerma
n
n
2
.
3
.
2
r
elease
notes: typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-27
Ju
n
io C Hamano
Mer
g
e branch 'jk/t
a
g-h-
c
olu
m
n-is-a-listing-option'
.
.
.
commit
|
commitdiff
|
tree
2015-03-27
Juni
o
C Haman
o
Merge bran
c
h
'
jk/sm
a
rt-h
t
t
p-hide-refs
'
into maint
commit
|
commitdiff
|
tree
2015-03-27
Ju
n
io C
H
aman
o
Merge
b
ranch
'
j
s
/
c
om
p
letio
n
-ctags-patte
r
n
-substitut
i
o
n
.
.
.
commit
|
commitdiff
|
tree
2015-03-27
J
unio C Hamano
Update mail
m
a
p to spell out
"
Alexander Kuleshov"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-26
Junio C Hamano
dif
f
-n
o
-index: align D/F handling with that of n
o
rmal Git
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-26
Sebastian Schuberth
do
c
s:
clarify "preserve" option wording for g
i
t-pu
l
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-26
Phil Hord
git-p
u
sh
.
txt: clean up force-w
i
th-lease wordi
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-26
Junio C H
a
man
o
diff-no-i
n
de
x
:
DWI
M
"diff D F"
i
nto "d
i
ff
D
/F F"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-24
Junio
C
Ha
m
ano
report_path_error(): mov
e
to dir
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-24
Nguyễn
T
hái Ngọ
c
Duy
git
.
txt
:
lis
t
ind
e
x ve
r
s
i
o
n
s
in plain E
n
g
l
i
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-23
Junio
C
H
a
mano
Git 2
.
3
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-23
Junio C
H
amano
Merge br
a
n
ch 'rs/use-isx
d
i
git' into
maint
commit
|
commitdiff
|
tree
2015-03-23
Junio C Hamano
M
e
rge branch
'rs/de
f
l
a
t
e
-init-cl
e
a
n
up' into
maint
commit
|
commitdiff
|
tree
2015-03-23
Junio C
H
amano
Merge branch 'ak
/
git
-
done-help-cleanup
'
into
m
aint
commit
|
commitdiff
|
tree
2015-03-23
Junio C Ham
a
no
Merge branc
h
'
s
g/completion-rem
o
te' into
maint
commit
|
commitdiff
|
tree
2015-03-23
J
unio C
H
amano
Merg
e
branch 'mg/doc-sta
t
us-color-s
l
ot' into
maint
commit
|
commitdiff
|
tree
2015-03-23
J
u
n
io C
Ham
a
no
Merge
branch
'
j
c/d
e
corate-
l
eaky
-
sepa
r
ator-color' into
.
.
.
commit
|
commitdiff
|
tree
2015-03-23
Junio C
Haman
o
Merge
branch
'
kn/
g
i
t-cd-to-empty' into
main
t
commit
|
commitdiff
|
tree
2015-03-23
J
u
n
i
o C Hamano
Merge branch 'km/imap-send-libcurl-options
'
into
maint
commit
|
commitdiff
|
tree
2015-03-23
Junio C Hamano
Merge branch 'mg/verify
-
c
o
mmit' into
m
aint
commit
|
commitdiff
|
tree
2015-03-23
Jun
i
o C Hamano
Merge branch '
e
s/rebase-i-count-todo' into m
a
i
n
t
commit
|
commitdiff
|
tree
2015-03-23
Junio C
H
am
a
no
Merge bra
n
ch
'
t
b/connect-ipv6-
p
arse-fix' in
t
o main
t
commit
|
commitdiff
|
tree
2015-03-22
SZEDER Gábor
complet
i
on:
u
s
e __gitcomp_nl() f
o
r completing refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-20
Thomas G
u
mmerer
r
ead-cache: fix reading of split ind
e
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-20
J
eff Ki
n
g
ref
s
.
c: d
r
o
p
curate_packed_refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-20
Jeff
King
repack:
t
urn on
"
r
e
f
paranoia" when doing a
d
e
structive
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-20
Jeff King
prun
e
: turn on re
f
_paranoia flag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-20
Je
f
f King
r
efs: i
n
troduce a "ref par
a
n
oia" fla
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-20
J
e
f
f King
t5312:
test
o
bject deletion code paths i
n
a
corru
p
ted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-20
Thoma
s
G
ummerer
t1700: ma
k
e test pass with index-v4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-19
Jef
f
Ki
n
g
fetch
-
pac
k
:
remove dead assignment to ref->new_sha1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-19
Jeff K
i
ng
f
etch_refs_vi
a
_
p
a
c
k
: fre
e
extr
a
copy o
f
refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-19
Jeff Ki
n
g
filte
r
_ref: make a c
o
py of
e
xtra "sought" entrie
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-19
Jef
f
K
i
ng
filter_ref: avoid overwriting re
f
->old_
s
ha1 with garbage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-19
Jeff Kin
g
c
lone: drop period from end of die_
e
rrno message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-19
Jeff
King
clone: i
n
itialize atexi
t
cleanup handler
e
arlier
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-19
Jeff
K
ing
sha1fd_check: die
w
h
e
n
w
e cannot o
p
e
n
t
he file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-19
Wilhelm S
c
huermann
grep: fix "-
-
quie
t
"
overwri
t
ing c
u
r
r
e
nt output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-15
Ju
n
io C
H
a
m
ano
Sub
m
it
t
ingP
a
tc
h
es:
e
n
c
ourag
e
users to us
e
format-patch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-15
C
ody A Taylor
git promp
t
: use t
o
plevel
to find untra
c
k
e
d files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-15
John Szakmeist
e
r
contrib/completion:
e
scape the forward slash i
n
__git_match_ctag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-14
Junio
C
Hama
n
o
Git 2
.
3
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2015-03-14
Junio C Ham
a
n
o
Me
r
ge branch 'mr/doc-cle
a
n-f-f' i
n
to maint
commit
|
commitdiff
|
tree
2015-03-14
J
u
n
i
o
C Hama
n
o
M
e
rge
b
ranch 'ak
/
t5516-typofix' into ma
i
n
t
commit
|
commitdiff
|
tree
2015-03-14
Ju
n
io C Hamano
Merge branch '
j
c/diff-te
s
t-updat
e
s' in
t
o maint
commit
|
commitdiff
|
tree
next