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
modify/delete conflict resolution overwrites untracked file
2008-12-15
Clemens Buc
h
acher
modify
/
delete conflict res
o
lutio
n
overwrites untracked
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Jim Me
y
ering
git-conf
i
g
.
txt:
f
ix a typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Linus T
o
rvalds
fsck:
r
ed
u
ce stack footprint
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Nicolas Pi
t
re
make sure packs to be replace
d
are c
l
osed beforeh
a
nd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio
C
Hamano
work aro
u
nd Python
w
arnings from AsciiD
o
c
Signed-off-by:
Junio C Hamano
<junio@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-09
D
e
skin M
i
lle
r
git
-
svn:
M
a
ke fo
l
lowi
n
g parents atomic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Junio C Hamano
GIT 1
.
6
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Mat
t
McCutchen
"
g
it diff <tre
e
>{3
,
}": do n
o
t reverse
order of argumen
t
s
commit
|
commitdiff
|
tree
2008-12-07
Jeff King
tag
:
d
e
l
e
te TAG_EDITMSG only on succes
s
ful tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Jakub
N
arebski
g
i
t
w
eb: M
a
ke pr
o
je
c
t spe
c
ific override f
o
r 'grep'
f
e
a
tu
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Miklos V
a
jna
h
t
tp
.
c: use
'
g
it_confi
g
_string' to get 'curl_http_proxy'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Thomas
Rast
fetch-
p
a
c
k: Avoid memcpy()
with sr
c
==d
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Junio
C Hamano
Merge branch 'jk/maint-commi
t
-v-str
i
p' into maint
commit
|
commitdiff
|
tree
2008-12-03
D
avide Libe
n
zi
xdiff:
give up s
c
an
n
ing
s
im
i
la
r
lines early
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Junio C Hamano
Merge br
a
nch
'
bc/ma
i
nt-keep-pack' int
o
maint
commit
|
commitdiff
|
tree
2008-12-03
Jun
i
o C Hamano
Me
r
ge bra
n
ch
'js
/
ming
w
-
r
e
n
ame-fix' into
maint
commit
|
commitdiff
|
tree
2008-12-02
Miklos Vajna
User's
M
anual: rem
o
ve
duplic
a
ted url at the end
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-01
Junio
C
Hamano
Update
dra
f
t release notes t
o
1
.
6
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-01
Junio C Hama
n
o
Mer
g
e
br
a
nch
'
st
/
maint-tag'
i
nto maint
commit
|
commitdiff
|
tree
2008-12-01
Jun
i
o C Ha
m
ano
Merge branch 'mk/maint-cg-p
u
sh'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2008-12-01
Nguyễn Thái Ngọc Duy
generate-cm
d
l
ist
.
sh:
a
void selecting syn
o
psis at wr
o
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-28
J
unio C Hamano
M
erge branch
'mv/fast-export' int
o
maint
commit
|
commitdiff
|
tree
2008-11-28
Sam V
i
lain
sh
a
1_file
.
c: re
s
o
lve con
f
usion EACC
E
S vs
EPER
M
commit
|
commitdiff
|
tree
2008-11-28
Joey H
e
ss
sha1_file: avoid bogus "fi
l
e exists" e
r
ror message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-28
M
att M
c
Cutchen
git checkout: don't warn about un
b
or
n
branch if -f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-28
SZEDER Gá
b
or
ba
s
h: offer refs i
n
stead
o
f file
n
am
e
s
for 'git re
v
ert'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-28
SZED
E
R Gáb
o
r
bash: re
m
ove
d
a
shed
c
o
mman
d
le
f
tove
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-27
Junio C
Hamano
Mer
g
e b
r
a
nch 'pw/maint-p4' into mai
n
t
commit
|
commitdiff
|
tree
2008-11-27
P
e
te Wyckoff
git-p4: fi
x
keyword-expan
s
i
o
n
regex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-27
R
alf Wildenhues
Fix typos
i
n
t
he documentation
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-26
Junio C
Haman
o
Merge branch 'mm/maint-sort-config-do
c
' i
n
to
maint
commit
|
commitdiff
|
tree
2008-11-26
Matt McC
u
tchen
config
.
txt:
alphab
e
t
i
ze co
n
figurati
o
n sections
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-26
Junio
C Hamano
T
each "git diff" to hon
o
ur -
-
[
n
o-]ext-diff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-24
Johannes Schindelin
fast-exp
o
rt
:
use an unsorted string li
s
t
for
e
xtra_re
f
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-24
Mikl
o
s
Vajna
A
dd new test
c
ase to sho
w
fast-export does not alwa
y
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-24
Bry
a
n
D
r
ewer
y
Fix misleading wording for git-cherry-pick
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-24
Jo
h
an
n
es
Sixt
compat/mingw
.
c: Te
a
ch mingw_rename() to replace read
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-17
Stefan Na
e
we
r
e
quest-pull: mak
e
usage st
r
ing match
m
anpage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-16
Junio
C Hamano
Te
a
ch ls-files --with
-
tree
=
<tr
e
e> to work with options
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-16
Junio
C
Hamano
builtin-ls-files
.
c: coding style
fix
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-15
J
a
n
K
rüger
Documentation: g
i
t
-svn: fix exa
m
ple for
centralized
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-15
C
h
ristian C
o
uder
Do
c
umentation
:
fix links
to
"
everyday
.
html"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-15
Brandon Casey
revision
.
c: use prop
e
r
dat
a
type in c
a
l
l
t
o
sizeof
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-15
B
r
andon Casey
re
p
ack:
only unpack-unreachable
if
w
e are deleting
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-13
Lin
u
s Torvalds
date/ti
m
e:
do not g
e
t confuse
d
by frac
t
ional
seconds
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-13
Brandon C
a
sey
t7700: test that 'repa
c
k -a' packs a
l
ter
n
a
te pack
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Junio C
Hamano
S
tart 1
.
6
.
0
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
N
i
col
a
s Pitre
Fix p
a
ck
.
p
a
ckSi
z
eLimit and --ma
x
-pack-size handl
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Junio
C Haman
o
check
o
u
t: Fix "initial
checkout"
d
e
t
ection
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Jeff King
co
m
mit: Fix stripping
of pat
c
h i
n
v
e
rbose
mode
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Matt Kraai
Rem
o
ve the period after
the
gi
t
-check-
a
ttr su
m
mary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Brandon
C
a
s
ey
p
a
ck-obj
e
c
ts: exten
d
-
-l
o
ca
l
to mean ignore non-loc
a
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Brandon Casey
sha
1
_file
.
c: split ha
s
_
loose_obj
e
ct()
i
n
to lo
c
a
l and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Brand
o
n
C
a
sey
t77
0
0: demonstrate mishandling of
loose objects in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Brandon Case
y
built
i
n-gc
.
c:
use new
p
a
c
k_keep
b
itfield to detect
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Bran
d
on
Casey
repack: do not fall back to i
n
cremental repacking with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
B
r
a
n
don Casey
r
e
pack:
d
on
'
t repack
loc
a
l objects in
p
a
c
ks with
.
keep
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Brandon Cas
e
y
pa
c
k
-
objects: ne
w
option --honor-
p
ac
k
-ke
e
p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Brandon Cas
e
y
pac
k
ed
_
git: c
o
n
v
e
r
t pack_local flag in
t
o a
b
itf
i
e
ld
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-12
Brando
n
Ca
s
ey
t7700: demonstrate mishand
l
i
n
g of objects
in packs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-11
Martin Koe
g
ler
git push: Interpr
e
t $GIT_DIR/branches in a
C
ogito c
o
mpa
t
ible way
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-11
Daniel Lowe
Fix no
n
-literal format in printf
-
s
tyle calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-11
Al
e
xandre Jull
i
a
rd
git-sub
m
odule
:
Avoid printing
a
spur
i
ous messag
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-11
Stefan Naew
e
g
it ls-remote: make
u
sage st
r
i
n
g
match manpage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-11
Junio
C Hamano
M
ake
f
ile: help people
w
ho run 'ma
k
e check' by mistake
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-09
Christ
i
an Couder
Documentat
i
o
n
:
bisect: change a few instances of "git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-09
Chri
s
tian
Coude
r
Docum
e
n
t
ation: rev-l
i
s
t: ch
a
nge
a
few instances of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-09
Alexan
d
r
e Jull
i
a
r
d
check
o
ut: Do
n
't crash when switching aw
a
y fro
m
an invali
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-09
Junio C Ham
a
no
GIT 1
.
6
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-09
Quy Tont
h
at
Update RPM spec for the new locatio
n
of
git-
c
v
s
server
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-09
Junio C Hama
n
o
M
e
r
ge
b
ranch 'cb/ma
i
n
t
-update-ref
-
fix' into m
a
int
commit
|
commitdiff
|
tree
2008-11-09
Junio C H
a
mano
Merge bran
c
h 'cj/maint-g
i
tpm-fix
-
maybe
-
self'
i
n
to
m
aint
commit
|
commitdiff
|
tree
2008-11-09
Junio C Hamano
M
erge branch 'ar/m
a
int-mksnpath' into m
a
int
commit
|
commitdiff
|
tree
2008-11-09
Junio
C Hamano
Me
r
ge branch 'mv
/
maint-branch-m-sy
m
ref'
into maint
commit
|
commitdiff
|
tree
2008-11-05
C
l
emens Buchacher
push: fix local refs update if already up-to-
d
ate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-05
Cleme
n
s Buchacher
do n
o
t
force
wri
t
e of pac
k
ed refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-04
Sa
m
uel
T
ardieu
tag: Add
mo
r
e tests ab
o
u
t mix
i
n
g
incompatible mode
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-04
Samuel Tardieu
tag: Check that
o
ptions are only allowed
in the
a
ppropriate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-03
Junio C H
a
mano
f
o
r
mat
-
patch documentat
i
on: mention
the
s
pecial case
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-02
Yann Dirso
n
Add referen
c
e for sta
t
us letters in docume
n
tation
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-02
Mikael Mag
n
usson
Document that git-lo
g
takes --
a
ll-match
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-02
Ju
n
i
o C H
a
m
a
n
o
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 bra
n
ch '
j
s/main
t
-f
e
tch-u
p
da
t
e-head' into maint
commit
|
commitdiff
|
tree
2008-11-02
Jun
i
o C Hamano
Merge
branch 'jk/maint-ls
-
files-
o
ther'
i
nto
m
aint
commit
|
commitdiff
|
tree
2008-11-02
Ju
n
io C
H
amano
Merge b
r
anch 'jc/maint-
r
e
se
t
-
r
e
m
ove
-
unmerged-new'
into
.
.
.
commit
|
commitdiff
|
tree
2008-11-02
Junio
C Hamano
Mer
g
e branch '
j
c/maint-
c
o-t
r
ack' in
t
o m
a
int
commit
|
commitdiff
|
tree
2008-11-02
Junio C Hamano
Start 1
.
6
.
0
.
4 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-02
Tom P
r
eston-Werner
add
instructions on h
o
w
t
o
s
e
n
d patc
h
e
s to the mai
l
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-02
Jakub Narebs
k
i
Documen
t
ation/gitattr
i
butes: Add
s
ubsect
i
on header
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-02
Pie
r
re Habouzit
git send-email: avoid
l
eaking directory
f
ile
d
es
c
riptors
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-02
Jeff King
send-pack
:
do not send
o
ut sin
g
le-
l
e
v
el re
f
s
su
c
h as
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-02
J
e
ff King
fix overlappin
g
me
m
c
p
y in normalize_abs
o
lute_pat
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-02
Jeff King
p
ack-objects:
a
v
o
id r
e
adin
g
uninitalized data
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-02
J
eff King
correct
cache_entry allocation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-11-02
Junio C
H
am
a
n
o
Merge branch
'
maint' of g
i
t://repo
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2008-11-01
Mi
k
l
os Vajna
update-ref --n
o
-deref
-d
:
ha
n
d
l
e
t
he case when the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-31
D
eskin Miller
git-svn:
change da
s
hed git-comm
i
t-tree to git co
m
mit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-31
Jan Krüg
e
r
Documentation: clarify information
a
bout 'ident'
a
ttri
b
ute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-31
Markus H
e
idelberg
b
as
h
com
p
l
etion: add
d
oubledash to "git s
h
o
w
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-10-31
Ale
x
Riesen
Use tes
t
-
c
hmtime -v
i
n
s
tead
o
f
pe
r
l in t5000 to get
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next