repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
modify/delete conflict resolution overwrites untracked file
2008-12-15
Clemens
Bu
c
hacher
m
od
i
fy/delete conf
l
ict
resolutio
n
over
w
rites un
t
rack
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Jim Meyering
git-config
.
txt: fix
a
t
y
po
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Linus To
r
valds
fsc
k
: redu
c
e stac
k
footprint
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
N
icolas Pit
r
e
make sure packs to
b
e repla
c
ed a
r
e closed
b
efor
e
hand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Ham
a
no
work
arou
n
d Python warni
n
gs fr
o
m A
s
ci
i
Doc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
Deskin Mil
l
er
git-svn
:
Make foll
o
wi
n
g parents atomic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Junio C Ham
a
no
GI
T
1
.
6
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Matt McCutche
n
"
git diff <tree>{
3
,
}": d
o
not revers
e
order of arguments
commit
|
commitdiff
|
tree
2008-12-07
J
eff
K
ing
tag: delet
e
TA
G
_EDITMSG only on suc
c
essful tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Jakub Nar
e
bski
gi
t
web: Make p
r
ojec
t
sp
e
cific override f
o
r 'grep' featu
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
M
iklos Vajna
http
.
c
:
use
'git_
c
onfig
_
string' to get
'
c
url_http_prox
y
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Thomas Rast
f
etch-p
a
ck: Avoid memcpy()
w
it
h
src
=
=ds
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Junio
C
Hamano
Merge bran
c
h 'jk/maint-com
m
it-v-s
t
rip' into ma
i
nt
commit
|
commitdiff
|
tree
2008-12-03
Davide Liben
z
i
xdiff: giv
e
up scan
n
i
ng similar line
s
early
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
J
u
nio
C
H
amano
Merg
e
branch 'b
c
/maint-
k
ee
p
-pac
k
'
i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2008-12-03
Junio C Hamano
Merge branch 'js/mingw-ren
a
me
-
fix' in
t
o
mai
n
t
commit
|
commitdiff
|
tree
2008-12-02
M
i
klo
s
Vajna
User's Manual: remove duplicate
d
url at the en
d
of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-01
Junio C Hamano
U
pdate draf
t
release notes to 1
.
6
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-01
J
unio C Hamano
Merge branch 's
t
/maint-tag'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2008-12-01
Junio C Hamano
Me
r
ge branch 'mk/maint-cg-pu
s
h
'
into maint
commit
|
commitdiff
|
tree
2008-12-01
Nguyễn Thái Ngọc
D
u
y
gener
a
t
e-cmdlist
.
sh: avoid sel
e
cting synops
i
s at wrong
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-28
J
u
n
io C
Ha
m
ano
M
e
r
g
e
br
a
nch 'mv/fast-export' in
t
o maint
commit
|
commitdiff
|
tree
2008-11-28
Sam Vil
a
in
sha1_file
.
c: resolve conf
u
sion EACCES
vs
EPERM
commit
|
commitdiff
|
tree
2008-11-28
Joey Hess
sha1_file:
avoid
bo
g
us "file exists
"
error message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-28
Ma
t
t
McCutchen
git
c
heckout: don't warn a
b
o
ut u
n
bor
n
branch if -f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-28
SZED
E
R Gábor
bash: offer refs i
n
ste
a
d of fi
l
enames for 'git revert'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-28
SZEDER G
á
bor
bas
h
: remov
e
dashed command le
f
t
o
v
er
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-27
Junio C Hamano
Merge br
a
nch 'pw/m
a
int-p4'
into ma
i
nt
commit
|
commitdiff
|
tree
2008-11-27
Pete Wyc
k
off
git-p4:
f
i
x
keyword-expansion regex
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-27
Ralf Wil
d
e
n
hues
Fi
x
typos
i
n th
e
do
c
umentat
i
o
n
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-26
Ju
n
io C Hamano
Me
r
ge
b
r
an
c
h 'mm/maint-sort
-
conf
i
g-
d
oc' int
o
main
t
commit
|
commitdiff
|
tree
2008-11-26
Matt McCutc
h
e
n
config
.
txt: alphabetize
c
onfigu
r
atio
n
section
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-26
Junio C Hamano
Teach
"
g
i
t
diff" to honour --[no-]ext
-
d
i
f
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-24
Johan
n
e
s
S
chindelin
fast-
e
xport: us
e
an unso
r
te
d
string list for
extra_
r
efs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-24
Miklos Vajna
Add new testcase to
s
how fast-export does no
t
always
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-24
Bryan Drewery
Fix
m
isleadin
g
wording for git-cherry-
p
ick
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-24
Johannes
Sixt
compat
/
mingw
.
c: Teach
mingw_rename() to
rep
l
ace read
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-17
S
t
efan Naewe
requ
e
st-pull: make usage st
r
ing match manpage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-16
J
uni
o
C Ha
m
ano
T
e
a
c
h
ls-fi
l
es --wi
t
h-t
r
e
e
=<tree> to wo
r
k
with opti
o
ns
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-16
Jun
i
o
C H
a
mano
built
i
n-ls-f
i
les
.
c
: codi
n
g style fix
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-15
Jan Krüge
r
Doc
u
mentation: git-svn: fix example fo
r
centralized
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-15
Christian Couder
Documentation: f
i
x
lin
k
s to "everyday
.
html"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-15
Brandon Cas
e
y
r
e
visi
o
n
.
c: use prop
e
r data type i
n
call t
o
sizeof
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-15
Brandon Casey
re
p
ack: o
n
ly unpa
c
k-unr
e
acha
b
le if we are deleting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-13
Li
n
us Torva
l
ds
date/time: do not get confu
s
ed
by fra
c
tional s
e
co
n
ds
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-13
Brandon Casey
t
7
7
0
0: test
t
hat 'repack -a
'
packs alternate packed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Ju
n
io
C Ham
a
n
o
S
t
art 1
.
6
.
0
.
5
c
ycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Nicolas Pitre
Fix pack
.
packSizeL
i
mit
a
nd --max-pac
k
-
size handl
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
J
u
n
i
o C Hamano
checkout: Fix "in
i
tial checko
u
t" detection
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Jeff King
c
o
mmit: Fix
s
tripping of patch in verbose mo
d
e
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
M
a
tt Kr
a
a
i
R
e
move
the period
after th
e
git
-
check-attr
summa
r
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Brandon Casey
pack-objects: exten
d
--local to mean ignore non-lo
c
al
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Brandon Casey
sha
1
_
f
ile
.
c:
split has_loos
e
_obje
c
t
()
i
nto local and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Brandon Casey
t
7700:
d
emonstrate mishandling of l
o
o
s
e objects in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Brandon Casey
b
u
ilt
i
n-gc
.
c: use new p
a
ck_
k
eep bitfield
to detect
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Bran
d
on Casey
repack: do not
f
all b
a
ck to in
c
remental re
p
acking
w
ith
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Bran
d
on Casey
repac
k
: don't repack
lo
c
al
object
s
in packs wi
t
h
.
keep
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Brandon
C
asey
pack-ob
j
ects: new option --h
o
nor-pack
-
keep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Bra
n
don Casey
packed
_
git: convert
p
ack_l
o
cal
flag in
t
o a
b
itfield
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-12
Brandon Casey
t7700: demo
n
strat
e
mis
h
andling of objects in p
a
c
ks
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-11
Martin Koegler
git push: Interpr
e
t $GI
T
_DI
R
/b
r
anc
h
es
in a Co
g
ito com
p
a
t
ible way
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-11
Daniel
Lowe
F
ix
no
n
-l
i
teral format in printf-style calls
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-11
Alexandre
J
u
lliard
git-submod
u
le: Avoid
p
rinting a spurious message
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-11
S
tefan Naew
e
git ls-remote: ma
k
e usage string
match
manpage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-11
Junio C Ham
a
no
Ma
k
ef
i
le:
h
elp people
w
ho run 'make check' b
y
mista
k
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-09
Christian Couder
Docu
m
entatio
n
: bisec
t
: change a few in
s
tances of
"git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-09
Christi
a
n Cou
d
er
D
ocumentation:
rev-list:
cha
n
g
e
a fe
w
in
s
ta
n
c
es
of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-09
Al
e
xa
n
dre Julliard
c
h
ecko
u
t
:
Don't crash when swi
t
ching away
from
an invalid
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-09
Jun
i
o C Hamano
GIT 1
.
6
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-09
Q
u
y Tonthat
Updat
e
RPM spec for
the new lo
c
ation
o
f gi
t
-cvsserver
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-09
Junio
C
Hamano
M
e
r
g
e branch 'c
b
/mai
n
t-u
p
da
t
e-ref-fix' into mai
n
t
commit
|
commitdiff
|
tree
2008-11-09
J
unio
C
Hama
n
o
Me
r
ge b
r
anch 'c
j
/
m
ain
t
-gitpm-fix-m
a
yb
e
-self' i
n
to maint
commit
|
commitdiff
|
tree
2008-11-09
Junio C Hama
n
o
M
e
rg
e
b
r
a
nch 'ar/maint-mk
s
npa
t
h' into ma
i
nt
commit
|
commitdiff
|
tree
2008-11-09
J
u
n
io C Hamano
Mer
g
e
b
ranch 'mv/maint-
b
ran
c
h-m-symref' into maint
commit
|
commitdiff
|
tree
2008-11-05
C
l
e
m
ens B
u
chac
h
e
r
p
ush: fix local refs upda
t
e if a
l
rea
d
y
u
p
-to-date
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-05
Cle
m
ens Buc
h
acher
do not f
o
rce write of
p
a
cked refs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-04
Samuel Tardi
e
u
tag: Add mo
r
e test
s
about mixing in
c
ompatible m
o
des
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-04
S
am
u
e
l Tardieu
t
ag:
Ch
e
ck th
a
t o
p
ti
o
n
s are only allo
w
ed i
n
the ap
p
rop
r
iat
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-03
J
u
n
io C Hama
n
o
format-p
a
tch d
o
cum
e
n
tation: ment
i
on the special case
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-02
Yann Dirson
Ad
d
r
e
fe
r
ence for
st
a
tu
s
l
etters
in doc
u
m
entation
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-02
Mi
k
ael Ma
g
n
u
s
s
on
D
ocument that git-log takes
-
-all
-
matc
h
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-02
Junio
C
H
a
m
ano
Update draft 1
.
6
.
0
.
4
rel
e
ase notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-02
Junio
C
Hamano
Merge branch 'j
s
/mai
n
t-fetch-update-head' into m
a
int
commit
|
commitdiff
|
tree
2008-11-02
Junio C
H
a
mano
Merge
b
r
anch 'jk/maint-ls-files-other' in
t
o
m
aint
commit
|
commitdiff
|
tree
2008-11-02
Junio C
H
amano
M
e
rge branch 'jc/m
a
int-res
e
t-remove
-
unmerged-new'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2008-11-02
Junio C
Ha
m
a
n
o
Me
r
ge b
r
an
c
h 'jc/mai
n
t-co-
t
rack
'
into mai
n
t
commit
|
commitdiff
|
tree
2008-11-02
Junio C H
a
man
o
Start 1
.
6
.
0
.
4 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-02
Tom
P
res
t
on-
W
erner
add
i
n
s
tructi
o
n
s
on how
t
o se
n
d patches
to the mailing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-02
Jakub Narebski
Documen
t
ation
/
git
a
ttributes: Add subsect
i
on he
a
der
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-02
Pierr
e
Habouzit
git
s
end-email: avoid
leaking
d
i
rectory file
d
escrip
t
ors
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-02
Jeff
K
i
n
g
send-pack
:
do not send out single-level ref
s
s
u
ch as
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-02
Jeff King
fix over
l
apping m
e
mcpy
in normalize_absolute_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-02
Jeff King
pack-
o
b
j
ects: avoid rea
d
i
ng uninitalized data
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-02
Jeff King
c
o
rrect cache_en
t
r
y
alloc
a
tio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-11-02
Junio
C Hamano
M
e
rge bran
c
h 'maint' of
g
i
t
:
/
/repo
.
or
.
cz/git-
g
ui into
.
.
.
commit
|
commitdiff
|
tree
2008-11-01
Miklos Va
j
na
update
-
ref --no-
d
eref -d
:
handle the
c
ase when t
h
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-10-31
Deskin
M
i
l
l
e
r
git-svn: change dashed git-c
o
mmit-tree
to git commit
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-10-31
Jan
K
rü
g
er
Documentati
o
n: c
l
ari
f
y i
n
for
m
at
i
on
a
bou
t
'ident' attri
b
ute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-10-31
Markus Heidelbe
r
g
bash compl
e
tion: add do
u
ble
d
ash to "git show"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-10-31
Al
e
x Rie
s
en
Us
e
test-
c
hmtime -
v
instead of perl
i
n t5000 to get
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next