repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation/git-merge.txt: weaken warning about uncommited changes
2013-06-18
Matthieu
Moy
D
o
c
u
mentation/gi
t
-merge
.
txt: we
a
ken
w
a
r
n
i
ng about unco
m
mi
t
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-12
Paul Price
fast-expor
t
: fix a
r
gument name in error me
s
sages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-12
Stefan Sa
a
sen
Documentation:
d
istinguish
b
et
w
e
e
n ref and offset deltas
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-07
Junio
C
Hamano
Git 1
.
8
.
1
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-07
Junio C Haman
o
M
e
rge branch
'jc/
d
ir
e
ctory-attrs-regression-f
i
x
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2013-04-07
T
o
rsten Böger
s
haus
e
n
remo
t
e-helper
s
/
te
s
t-bz
r
.
sh: do n
o
t use "grep '\
s
'"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-03
Juni
o
C Hamano
St
a
rt p
r
ep
a
ring fo
r
1
.
8
.
1
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-04-03
Juni
o
C Ham
a
no
M
erge b
r
an
c
h 'kb/name-h
a
s
h
' into maint-1
.
8
.
1
commit
|
commitdiff
|
tree
2013-04-03
Junio C
Ha
m
a
n
o
M
erge branch 'kk/revwa
l
k-slop-too-m
a
ny-commit-within
.
.
.
commit
|
commitdiff
|
tree
2013-04-03
Junio C Hamano
M
e
rg
e
bra
n
c
h
'jk/checkout-attribute-look
u
p' into ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2013-04-03
Junio C Hamano
Merge branch
'jk/fully-peeled-pac
k
ed-ref'
i
n
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2013-04-03
Junio C Hamano
M
e
rge bran
c
h
'ap/ma
i
nt
-
diff-rena
m
e-avoid-overlap' into
.
.
.
commit
|
commitdiff
|
tree
2013-04-03
Ju
n
io
C Ham
a
no
M
e
rge branc
h
'yd/doc
-
merge
-
a
n
notat
e
d-ta
g
' into main
t
.
.
.
commit
|
commitdiff
|
tree
2013-04-03
J
u
nio
C
Hama
n
o
Merge branc
h
'ap/maint-upd
a
t
e
-index-h-is-for-
h
e
l
p'
.
.
.
commit
|
commitdiff
|
tree
2013-04-03
J
unio
C
Hamano
Merg
e
branch 'jc/perl-cat-blob' into maint-1
.
8
.
1
commit
|
commitdiff
|
tree
2013-04-03
J
unio C Hamano
Mer
g
e branc
h
'ob/imap-send-
s
sl-verify
'
i
n
t
o maint-1
.
8
.
1
commit
|
commitdiff
|
tree
2013-04-03
Junio C H
a
mano
Merge bran
c
h
'n
d
/
index-pac
k
-l10n-buf-overflow' into
.
.
.
commit
|
commitdiff
|
tree
2013-04-03
Thomas
R
a
s
t
git-tag(1): we tag H
E
AD by defau
l
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-29
Jeff King
t: check
t
ha
t
a
pattern w
i
thout tr
a
i
ling
s
lash matches
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-29
Jef
f
K
i
ng
d
i
r
.
c::match_
p
athna
m
e()
:
pay a
t
tention to
t
he length
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-29
Jeff K
i
n
g
dir
.
c::m
a
tch_pathnam
e
(): adj
u
st patt
e
rnlen when shi
f
ting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-29
Junio C H
a
mano
dir
.
c::match_basename(): pay attention to t
h
e
length
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-29
Junio C Hamano
attr
.
c
:
:pat
h
_matc
h
es():
special c
a
se paths tha
t
end
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-28
Matthias
K
rüger
g
it help config:
s
/in
s
n
/
instru
c
tion
/
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
merge-
t
ree: fix
typo i
n
merge-tree
.
c::unresolved
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-27
C
hristian Helmuth
git
-
c
ommi
t
doc: describe use of multip
l
e `
-
m` optio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-27
Mi
h
ai Capot
ă
git-pull doc: fix
g
rammo ("confli
c
ts"
i
s
plural)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-26
J
u
n
i
o
C
Hama
n
o
at
t
r
.
c
::path_matches(): the
b
asena
m
e i
s
p
a
rt of the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-26
D
a
n Bornstein
Correct
t
he docs
abou
t
GIT_SSH
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-25
Junio C Ham
a
no
Merge
branch 'lf/bun
d
le-ve
r
ify-list-p
r
e
r
e
qs'
into
maint
.
.
.
commit
|
commitdiff
|
tree
2013-03-25
Junio
C Hamano
Merge branch 'tk/d
o
c-fil
t
er-branch' in
t
o
ma
i
nt-1
.
8
.
1
commit
|
commitdiff
|
tree
2013-03-25
J
u
nio C Hama
n
o
Merge
b
ran
c
h '
d
m/ni-max
h
ost-may-be-missing
'
int
o
main
t
.
.
.
commit
|
commitdiff
|
tree
2013-03-25
Junio C
H
amano
Merge
branch
'
g
p/describe-match-uses-glob-patte
r
n
'
.
.
.
commit
|
commitdiff
|
tree
2013-03-25
Jun
i
o C
H
amano
Mer
g
e
b
r
anch 'nd/d
o
c-index-form
a
t
'
into maint-
1
.
8
.
1
commit
|
commitdiff
|
tree
2013-03-25
Jun
i
o C
H
ama
n
o
Merge branch 'wk/doc-
p
re-
r
ebase' into
m
aint-1
.
8
.
1
commit
|
commitdiff
|
tree
2013-03-25
Junio C H
a
man
o
Merge branch 'j
c
/
color-diff-doc'
i
nto maint-1
.
8
.
1
commit
|
commitdiff
|
tree
2013-03-22
K
acper Kornet
Fix revision walk for comm
i
ts wi
t
h the same dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-21
J
unio C Hamano
Docum
e
ntation
:
mergin
g
a
ta
g
is a
s
pecial case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-20
J
o
h
a
nn
e
s Si
x
t
t200
3
: work aro
u
nd pa
t
h man
g
ling issue on
W
indows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-18
Mic
h
a
e
l
Hagger
t
y
pack-refs: add
fully-p
e
el
e
d trait
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-17
Kacper Kornet
t
15
0
7: Test that bra
n
chname@{upstream} is
interpr
e
t
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-17
J
e
f
f
K
ing
pack-refs: write
p
eeled e
n
try for non-
t
a
gs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-17
J
e
ff
K
ing
use parse_
o
bject_or_di
e
inste
a
d of die("ba
d
object")
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-17
Je
f
f
K
ing
avoid segfaults on pa
r
se_ob
j
ect failure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-17
Kacper Kornet
rev-pa
r
se
:
clarify docu
m
entati
o
n o
f
$name
@
{upstream
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-17
René Scharfe
sha1_name: pass object name le
n
g
th to diagnose_invalid_sha
1
_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-17
Ren
é
Scharfe
Makefile: kee
p
LIB_H
e
ntries t
o
gether and sorted
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-17
Nguyễn Thái
N
gọc D
u
y
inde
x
-pack: fix buffer overflo
w
caused by tran
s
lations
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
entry: fix filter loo
k
up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-14
John Keeping
t2003: modernize styl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-11
Kevin Bracey
git
.
c: mak
e
usage match man
u
a
l
pa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-10
Kevin Brac
e
y
Translate g
i
t_mo
r
e_inf
o
_string cons
i
stently
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-09
Antoine Pelisse
p
e
rf: update documentation of GIT_PERF_
R
EPEAT_COUNT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-08
Lukas Fleis
c
her
bundle: Add colons
t
o lis
t
head
i
ngs in
"verify"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-07
L
ukas Fleischer
bundle: Fix "verify" output if hi
s
tory
i
s complet
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-07
J
u
nio
C Hamano
M
e
rge branch 'mh/maint-ceil-abs
o
lute' into maint
commit
|
commitdiff
|
tree
2013-03-07
Fredrik G
u
stafss
o
n
gi
t
web
/
R
E
ADM
E
:
re
m
ove reference to git
.
ke
r
n
e
l
.
org
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-06
Antoine Pelisse
tests:
m
ake sure rename pre
t
ty print works
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-01
Junio C Ham
a
no
Git 1
.
8
.
1
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-01
Thomas Rast
Make !pat
t
ern in
.
gitatt
r
ibutes non-fatal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-03-01
Junio
C Hamano
M
erge branc
h
'wk/user-man
u
al' int
o
maint
commit
|
commitdiff
|
tree
2013-03-01
Andrew Wo
n
g
D
ocumentation
/
g
i
thooks: Fix linkgit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-28
Karsten
Blees
na
m
e-hash
.
c: fix endless loop
w
i
t
h core
.
ignore
c
ase
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-27
Juni
o
C Hama
n
o
U
p
date draft rele
a
se notes to 1
.
8
.
1
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-27
Juni
o
C Hamano
M
erge branch 'ef/non-ascii-parse-opt
i
o
n
s
-
er
r
o
r-diag
.
.
.
commit
|
commitdiff
|
tree
2013-02-27
J
unio C Ham
a
n
o
Merge branch 'wk/man-deny-current-branch-is-default
.
.
.
commit
|
commitdiff
|
tree
2013-02-27
Jun
i
o
C
Hamano
Mer
g
e branch 'jn/less-reconfig
u
re' into maint
commit
|
commitdiff
|
tree
2013-02-27
B
r
a
d
King
Documen
t
ation/submodule: Add --force to updat
e
syn
o
psis
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-26
T
homas Rast
d
i
ff: pr
e
vent pprin
t
_ren
a
m
e
from u
n
der
r
unning
i
nput
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-26
Tadeusz Andrzej
.
.
.
Docu
m
entat
i
on: filt
e
r-
b
ranch env-filter
exa
m
ple
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-26
Tadeusz A
n
d
rzej
.
.
.
git-fi
l
te
r
-
b
ran
c
h
.
txt: clar
i
fy ide
n
t variab
l
es usag
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-25
D
a
v
i
d
M
i
cha
e
l
g
it
-
compat-uti
l
.
h: Provide miss
i
ng
netdb
.
h de
f
ini
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-25
Junio C H
a
mano
Pr
e
pare for 1
.
8
.
1
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-25
Junio C H
a
mano
Merge br
a
n
c
h
'jc
/
mention-tracking-for-pull-
d
e
fault
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Jun
i
o C Ha
m
ano
Merge
b
ranch 'mm/config-intro-
i
n-git-doc
'
into maint
commit
|
commitdiff
|
tree
2013-02-25
J
u
nio C Hamano
Merge branch 'da/p4merge-mktemp-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2013-02-25
J
u
nio C Hamano
Mer
g
e b
r
anch 'bw/
g
et-tz-offset
-
p
erl' in
t
o main
t
commit
|
commitdiff
|
tree
2013-02-25
Junio C H
a
mano
M
erge branch 'al/mergetoo
l
-prin
t
f-fix' int
o
maint
commit
|
commitdiff
|
tree
2013-02-25
Juni
o
C
Hamano
Merge b
r
anch
'
j
x/utf8-printf-width' int
o
m
a
i
nt
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Merge branch 'mg/bisect-doc' into
maint
commit
|
commitdiff
|
tree
2013-02-25
Junio C
H
ama
n
o
Merge branch 'sp/smart-htt
p
-
c
o
n
tent-t
y
pe
-
c
h
eck' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Junio
C Hamano
M
e
r
ge branc
h
'jc/c
o
mbin
e
-dif
f
-man
y
-p
a
rents'
i
n
t
o maint
commit
|
commitdiff
|
tree
2013-02-25
Juni
o
C Hama
n
o
Merge br
a
nch 'jk/ap
p
ly
-
similaritly
-
p
a
rsi
n
g' into maint
commit
|
commitdiff
|
tree
2013-02-25
Junio C H
a
mano
Merge
b
r
a
nch '
j
k/remot
e
-helpers-doc' into
maint
commit
|
commitdiff
|
tree
2013-02-25
J
u
nio C Hamano
Merge bran
c
h 'ab/gi
t
web-use-sam
e
-schem
e
' into maint
commit
|
commitdiff
|
tree
2013-02-25
J
u
nio C H
a
man
o
Mer
g
e branch '
z
k/clean-r
e
port-f
a
ilure' into maint
commit
|
commitdiff
|
tree
2013-02-25
Jun
i
o
C Hamano
Merge
b
r
a
nch 'nd/clone-no-s
e
parate-g
i
t-dir-w
i
th-bare
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Ju
n
i
o
C
Hamano
M
er
g
e branch 'da/p4merge-
m
ktemp' into maint
commit
|
commitdiff
|
tree
2013-02-25
Gre
g
Price
D
o
cumentation:
"advice" is un
c
ountable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-25
Greg
P
rice
describe: Document --match pattern
f
ormat
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-24
W
.
Trevor
King
Docu
m
e
n
tation/githo
o
ks
:
Exp
l
ain pre-r
e
bas
e
parame
t
ers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-24
Antoine Pelisse
diff: Fix rename p
r
etty
-
prin
t
w
h
en
suff
i
x an
d
prefix
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-24
A
n
toine Pelisse
update-in
d
ex: allow "
-
h" to
a
l
s
o
dis
p
l
a
y options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-23
N
g
u
yễn Thái
N
gọ
c
Duy
u
p
da
t
e-index: l
i
s
t
s
u
ppor
t
ed id
x
versi
o
ns and their
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-23
Junio C Hamano
d
i
ff-option
s
: unconfus
e
description of
-
-color
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-22
J
oshua
C
l
ayto
n
Git
.
pm: fi
x
cat_blob crashes o
n
la
r
ge files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-22
Nguyễn Thái Ngọc Duy
read-cache
.
c: us
e
INDEX_FORMAT_{LB,U
B
} i
n
v
e
r
ify_hdr()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-22
Nguy
ễ
n Thái Ngọc Duy
ind
e
x-for
m
at
.
txt: men
t
ion of v4 is
miss
i
n
g i
n
s
o
me
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-22
Michael Haggerty
Provide a mechanism t
o
t
u
rn off symlink
r
e
s
olution
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2013-02-21
Je
f
f King
Ma
k
efil
e
:
avoid infinite loop on configure
.
ac chang
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next