repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Changed an internal variable of mergetool to support custom commands
2008-03-05
Charles Bailey
Changed an internal variable of
mergetool to suppo
r
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Bailey
Tidy up git
mergetool's backup file be
h
aviour
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-05
Jun
i
o C Hama
n
o
fsck
.
c: fix bogus "empty tre
e
"
check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Junio C
Haman
o
Revert "un
p
ack-objects: prev
e
nt writing of inconsisten
t
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Junio C
Hamano
Revert "
r
ece
i
ve-pac
k
: us
e
strict
mode for
u
npacking
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Junio C Ham
a
n
o
Merge
bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2008-03-04
Shawn
O
.
Pearce
Fix 'git remote show' re
g
ression on empty r
e
p
osi
t
ory
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Mike Ho
m
mey
t3407-
r
eb
a
se
-
abort
.
s
h: Enhan
c
e existing
t
ests, an
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Simo
n
Hau
s
mann
git
-
p4: F
i
x
im
p
ort
of cha
n
gesets wi
t
h fi
l
e delet
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Alex Riesen
Fix t
e
st for cleanup
failure
i
n
t7300
on Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Junio
C Hamano
t6120 (
d
e
scribe): check --long
pro
p
erly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pearce
Add git-describe test for "veri
f
y annotated
tag names
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pearce
T
est
for pa
c
k
ed tags in
g
it-describe ou
t
pu
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-04
Sha
w
n O
.
Pearce
Don
'
t allo
w
git-d
e
s
cr
i
be failures to g
o
u
n
noticed in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Ju
n
io C Ha
m
ano
desc
r
ibe
:
re-fix dis
p
lay_name
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Matt
h
ieu Moy
F
ix incorrec
t
w
o
rding in git-merge
.
txt
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Gerrit Pape
gi
t
-merge
.
sh: better
h
a
ndling of comb
i
ne
d
--s
q
uash
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Mike Ho
m
me
y
Fix ran
d
om crashes in htt
p
_cleanup
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio C Hamano
descri
b
e: fix --lo
n
g output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio C Haman
o
g
i
t-describe: use tags found in
packe
d
-
re
f
s correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Martin Koegler
fetch-pack: ch
e
ck parse_co
m
m
i
t/obj
e
ct re
s
ults
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
J
uni
o
C
H
a
m
a
n
o
Update draft release note
s
for 1
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-03-03
Junio
C
H
a
mano
U
p
da
t
e
d
r
af
t
release notes for 1
.
5
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Jeff King
r
e
v
ert
:
a
c
tu
a
lly check
f
or a
dirt
y
index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Junio C Hamano
tests: i
n
troduce test_must_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Ping Yi
n
gi
t
-s
u
bmodul
e
:
F
ix typo 'url'
w
hich should be '$url'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Bjö
r
n
Steinbrink
rec
e
ive-pack: Initialize PATH
to include exec-dir
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
R
alf Wildenhues
Fix doc typos
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-03
Jean-Luc Herren
f
a
st-import: exit wi
t
h pr
o
per message if
not
a
git dir
commit
|
commitdiff
|
tree
2008-03-03
Ju
n
io C
H
a
mano
Merge b
r
a
nch 'np/verify-pack'
commit
|
commitdiff
|
tree
2008-03-02
J
o
ha
n
nes
S
c
h
indelin
format-pat
c
h:
wrap
c
over-le
t
t
er's sh
o
rtlo
g
sensibly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-02
Johann
e
s
Sc
h
inde
l
in
for
m
at-patch: use the
d
i
f
f opt
i
ons for
the cover
let
t
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-02
Jakub Nareb
s
k
i
gitweb: Mark firs
t
matc
h
whe
n
sea
r
chi
n
g co
m
m
i
t messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-02
Juni
o
C Hamano
Merge
b
ranch 's
p
/
describ
e
-t
a
g'
commit
|
commitdiff
|
tree
2008-03-02
Ju
n
i
o
C
Hamano
Me
r
ge branch
'
pb/c
v
si
m
port'
commit
|
commitdiff
|
tree
2008-03-02
Junio C Hamano
M
erge branch 'j
c
/main
t
-
l
og-merge-left-right'
commit
|
commitdiff
|
tree
2008-03-02
Junio C H
a
mano
Me
r
ge
b
ran
c
h 'mh/maint-ht
t
p-proxy-fix'
commit
|
commitdiff
|
tree
2008-03-02
Junio
C
Hamano
Merge br
a
n
c
h '
c
b/http-te
s
t'
commit
|
commitdiff
|
tree
2008-03-02
Junio C Hama
n
o
Merge branch 'j
c
/remote-multi-url'
commit
|
commitdiff
|
tree
2008-03-02
Juni
o
C Ha
m
a
n
o
Mer
g
e branc
h
'jn
/
gitweb-gre
p
'
commit
|
commitdiff
|
tree
2008-03-02
Junio
C
Hamano
Merge branch
'mk/maint-parse-c
a
r
e
ful'
commit
|
commitdiff
|
tree
2008-03-02
Junio C Hamano
Merg
e
branch '
s
b
/
d
e
scribe-
l
ong'
commit
|
commitdiff
|
tree
2008-03-02
Junio C
H
amano
Mer
g
e
b
ranch 'ew/m
a
int-svn-cert-filepr
o
vider'
commit
|
commitdiff
|
tree
2008-03-02
Junio C Ha
m
ano
M
e
rge br
a
nch '
j
s/mai
n
t-daemon'
commit
|
commitdiff
|
tree
2008-03-02
Jakub Nareb
s
k
i
Document
a
tion: Remove --{m
i
n,max}
-
ag
e
opt
i
o
n
fro
m
git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-02
Denis Ch
e
ng
cle
a
nup: remove un
u
sed
g
it_checkout_config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-02
Jo
h
a
n
nes Schi
n
delin
Fi
x
make_a
b
solute_pat
h
() fo
r
p
a
rame
t
ers without a slash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-02
Ju
n
io C Hamano
di
f
f: make
sure work tr
e
e sid
e
is shown as 0{40
}
w
hen
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-02
Junio C Hamano
d
iff-lib
.
c: cons
t
n
e
ss strengthening
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-02
Junio
C Haman
o
Clean u
p
find_unique_abbr
e
v() c
a
llers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-02
Junio C Ham
a
no
find_
u
nique_a
b
br
e
v():
r
e
d
efine se
m
antics
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-02
Mike Hommey
git re
b
ase --abort: alw
a
ys restore the r
i
ght com
m
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-02
Mike Homme
y
D
o
c
u
me
n
tat
i
o
n/
g
it-re
b
as
e
.
tx
t
: Add --st
r
ategy to synopsys
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-02
Junio C
Hamano
Cod
i
ngGuidelines: spell
out how
w
e use g
r
ep
i
n our
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Nicolas Pitre
add
s
torage size
output to
'
git
v
erify-pack
-
v
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Nicolas Pitre
fi
x
u
nimplement
e
d
p
a
c
k
e
d
_object_info_deta
i
l()
f
e
a
tures
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Nicola
s
Pitre
m
ake verif
y
_one
_
pack() a bit less wrong wrt packed_g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Nicolas Pitre
factorize re
v
i
n
dex co
d
e out of
bui
l
t
i
n
-p
a
ck-obj
e
c
t
s
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Jeff King
allow git-am to run
i
n a subdir
e
ctory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Jeff King
rename:
w
a
rn use
r
whe
n
w
e
h
a
ve turned off
rename dete
c
tio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Mik
e
Ho
m
mey
Add t
e
st
f
or git rebase
-
-abort
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Junio C
H
amano
t6024: move
"git reset" to pr
e
p
are for a
t
e
st inside
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Fr
a
nk Lich
t
enheld
gc: Add --quiet
op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
P
h
ilippe Bruhat
.
.
.
cvsimport: doc
u
ment th
a
t -M can be
u
sed multiple times
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Philippe Bruhat
.
.
.
cvsimport: allow for
mu
l
tiple -M options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Philippe
Bruhat
.
.
.
c
v
simport: h
a
ve
default me
r
g
e
regex allow
for dashes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
J
u
n
io C Ham
a
no
Merg
e
bra
n
ch 'ma
s
ter'
of
git:
/
/repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-03-01
Ju
n
i
o
C Hamano
Merge branch
'm
a
int'
commit
|
commitdiff
|
tree
2008-03-01
Mike R
a
lphson
D
o
c
u
mentati
o
n cherry-pick: Fix c
u
t-and-
p
aste error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Rémi Vani
c
at
git
.
el: find
t
he git-status buffer
whateve
r
its name is
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-01
Junio
C
Hamano
M
erge br
a
nch 'main
t
' o
f
g
i
t://
r
ep
o
.
or
.
c
z
/g
i
t-gui int
o
.
.
.
commit
|
commitdiff
|
tree
2008-03-01
Santi Béjar
c
l
one: suppo
r
t
c
loning
full bu
n
d
l
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-29
J
unio
C
Hamano
Update draft rele
a
s
e notes f
o
r 1
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-29
Jeff King
use bu
i
l
d-time SHEL
L
_PATH in test
s
c
r
ipts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-29
Daniel Barka
l
o
w
Write index file
on any
c
heckout of f
i
les
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-29
U
w
e Klein
e
-König
r
e
v-list: add --branches, --
t
a
gs and --
r
emotes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
Improve t6029 t
o
c
h
eck th
e
real "subtre
e
" case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-29
Daniel Barkalow
Use diff_tree(
)
direc
t
l
y in
m
aking cover lett
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-29
Daniel B
a
rkalow
A
lw
a
ys use t
h
e
c
urrent connectio
n
's remote ref list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-29
J
u
nio C Hamano
tests: int
r
oduce te
s
t
_
mu
s
t_fa
i
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-29
Alex Ries
e
n
Fix bui
l
tin checkou
t
c
rashing
w
hen given an inva
l
id
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-29
Junio
C H
a
m
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-02-29
Marti
n
Koegler
receive-pack: use
s
t
r
ict
mode for unpack
i
ng objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-29
Martin Koegler
i
n
d
e
x-pa
c
k:
intro
d
uc
e
checking
mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-29
Martin Koegler
unpack-objects:
prevent wri
t
ing of incons
i
stent ob
j
ects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-29
Martin Koegler
u
n
pa
c
k-obj
e
ct: cache for
no
n
writt
e
n obje
c
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-28
Shawn
O
.
Pe
a
rce
Teach git-
d
esc
r
ibe
t
o
verify annotated tag n
a
mes before
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-28
Gerrit Pap
e
t
e
mplates/Makefile
:
don
'
t d
e
pend on local
u
mask sett
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-28
Daniel Barkalo
w
Corre
c
t name of diff_flush() i
n
API doc
u
m
entation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-28
Jun
i
o C Ham
a
no
Start preparing for 1
.
5
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-28
Junio C Hamano
format-patch: remove a left
o
ver debugging
mes
s
a
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-28
J
ohannes Sc
h
indelin
completion: supp
o
rt format-patch's --
c
over-letter
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-27
Juni
o
C
Hamano
Fix "git
log --merge --l
e
ft-
r
igh
t
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-27
C
l
emen
s
Buc
h
acher
http-push:
a
d
d
r
egression
t
ests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-27
Clemens
B
uch
a
cher
http-push:
p
u
sh <remote> :<branch>
d
eletes
remote b
r
anch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-27
M
i
k
e Hommey
Set proxy
o
verride with http_i
n
it(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-27
Johann
e
s
Si
x
t
daemon: ensure th
a
t base-pa
t
h is an
e
xi
s
tin
g
directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-27
Johann
e
s Sixt
daemon:
sen
d
more erro
r
messages to th
e
syslog
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-02-27
Junio C H
a
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
next