repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add a very basic test script for git mergetool
2008-03-05
C
h
arles Bailey
Add a very basic test script for git mergetool
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bai
l
ey
Teac
h
git mergetool to use custom commands
d
efin
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
r
l
es Bailey
Changed an int
e
r
nal
var
i
able of mergetool to support
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Charles
B
ailey
Tidy up git mergetool's ba
c
kup file behaviour
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-05
Junio C Hamano
fsck
.
c: fix bogus
"empty tree" check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-04
Jun
i
o
C
Hamano
Revert "
u
n
p
ack-objec
t
s
:
p
revent wri
t
ing of incon
s
istent
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
J
unio
C
H
amano
R
e
vert "receive-pack: use strict mode for unpacking
.
.
.
commit
|
commitdiff
|
tree
2008-03-04
Junio C Haman
o
Mer
g
e
bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pe
a
rce
Fix 'git
r
emote s
h
ow' regres
s
ion on emp
t
y r
e
pository
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-04
Mike Hommey
t3407-re
b
a
s
e-abo
r
t
.
sh: Enhance exi
s
t
i
ng tests, and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-04
S
imon Hausmann
git-p4: Fix imp
o
r
t
of changesets wit
h
file deletions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-04
Alex
Ri
e
s
e
n
F
ix
t
e
st
for
c
leanup failure
i
n t
7
300 on Windows
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-04
J
u
nio C Hamano
t6120
(
describe
)
:
c
heck --long prope
r
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pe
a
rce
Add
g
it-des
c
r
ibe te
s
t
for "verify an
n
otated tag names
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pe
a
rce
Test
f
o
r packed ta
g
s in git-describe output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-04
Shawn O
.
Pearce
Don't allow git-describe failures t
o
go unnotic
e
d in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Junio C
Hamano
describe: re
-
fix
d
is
p
lay_
n
ame()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Matthieu Moy
F
i
x inc
o
r
r
ect wordin
g
in git-merge
.
txt
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Gerrit Pape
git-merge
.
s
h:
better hand
l
i
n
g of c
o
mbined
-
-squash
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Mi
k
e Hommey
Fix
r
ando
m
crashes
in http_c
l
eanup(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
J
u
nio C Hamano
des
c
ribe
:
fi
x
--long
o
u
tput
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Junio C Hamano
git-describe:
u
s
e tags found
i
n packed-refs correctl
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Martin Koeg
l
er
fetch-pack
:
c
h
eck parse_commit/objec
t
results
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Juni
o
C Ham
a
no
U
p
date d
r
aft
release notes
f
or
1
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Junio C
H
aman
o
Merge
b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-03-03
Junio
C Hamano
Update
dr
a
f
t release notes for 1
.
5
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Je
f
f
Ki
n
g
revert
:
actually check for a dirty index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Jun
i
o C
Hamano
tests: introd
u
ce t
e
st_mu
s
t_fa
i
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Ping
Y
in
git-submodule: Fi
x
typo
'
url' which should be '$
u
rl'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
B
jörn
Steinbrink
receive-pack: Ini
t
ialize PATH to include exec-di
r
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
R
alf W
i
ldenhues
F
i
x
d
oc typos
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-03
Jean-
L
uc Herren
fast-impo
r
t: exit with prope
r
message
i
f not
a git dir
commit
|
commitdiff
|
tree
2008-03-03
Junio C
H
amano
Merge branch '
n
p/verify-pack'
commit
|
commitdiff
|
tree
2008-03-02
Johannes Schindelin
f
ormat-patch
:
wr
a
p cover
-
letter's shortlog s
e
nsibly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-02
Johan
n
es
S
chinde
l
i
n
format-patch: use
t
he diff options f
o
r
th
e
c
over letter
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-02
Jakub Nare
b
ski
g
it
w
e
b
: Mark fir
s
t match when searching commit messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-02
J
u
n
io C Hamano
M
erge
b
ranch
'
sp/des
c
ri
b
e-tag'
commit
|
commitdiff
|
tree
2008-03-02
Junio C
Ha
m
ano
Merge branch 'pb/cvsimport'
commit
|
commitdiff
|
tree
2008-03-02
Junio C Ha
m
ano
Merge branc
h
'jc/m
a
int-log-
m
erge-left-right
'
commit
|
commitdiff
|
tree
2008-03-02
Junio C
Hamano
Merge branch 'mh/main
t
-http-proxy-fix'
commit
|
commitdiff
|
tree
2008-03-02
Junio C Hamano
Merge
b
ranch 'c
b
/http
-
test'
commit
|
commitdiff
|
tree
2008-03-02
J
u
nio C Hama
n
o
Merge
branch 'jc/remote-multi-url'
commit
|
commitdiff
|
tree
2008-03-02
Junio C Hamano
Merge b
r
anch 'jn/gitweb-
g
rep'
commit
|
commitdiff
|
tree
2008-03-02
Junio C Haman
o
M
erge branch 'mk/maint-p
a
rse-carefu
l
'
commit
|
commitdiff
|
tree
2008-03-02
Junio C
H
a
mano
M
erge branch '
s
b/describe-
l
on
g
'
commit
|
commitdiff
|
tree
2008-03-02
J
u
nio C
Ham
a
no
Merge bran
c
h 'ew/maint-s
v
n
-
cert-fileprovider'
commit
|
commitdiff
|
tree
2008-03-02
J
u
nio C Ha
m
ano
Merge branch 'js/ma
i
nt-daem
o
n'
commit
|
commitdiff
|
tree
2008-03-02
Jakub Narebski
Documentat
i
o
n: Re
m
ove -
-
{min,max}-age opti
o
n
f
r
om
git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-02
Denis Cheng
cleanup: r
e
move u
n
use
d
git_ch
e
ckou
t
_co
n
fi
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-02
J
oha
n
n
e
s
Schindelin
Fix make_abs
o
l
u
te_path() f
o
r pa
r
ameters with
o
ut a slash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-02
Junio
C H
a
mano
d
iff: make sur
e
work
t
r
ee side i
s
s
h
own as 0{40} when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-02
Junio C Hamano
d
i
ff
-
lib
.
c: constness strengthening
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-02
J
unio C Haman
o
Clean
u
p find_uniq
u
e
_abbrev() callers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-02
Ju
n
io
C
H
am
a
no
find_unique_abbrev(
)
:
r
edefine semantics
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-02
Mike Hommey
git rebase --
a
bort: al
w
ays restore the right co
m
mit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-02
Mik
e
Homm
e
y
D
o
c
u
m
entation/git-rebase
.
txt: Add --st
r
ategy to synopsys
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-02
J
unio C Hamano
Codin
g
Guid
e
lines: spell
ou
t
h
ow we use grep in our
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-01
Nicolas Pitre
add storage size output to 'g
i
t v
e
rify-
p
ack -v'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-01
Nicolas
P
itre
fix un
i
mplemented
p
acked_o
b
j
e
ct_info_det
a
il
(
) features
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-01
N
icolas Pitre
make veri
f
y_one_pac
k
(
) a bit le
s
s w
r
ong wrt p
a
cked_
g
it
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-01
Nic
o
las
P
itre
f
a
c
torize revin
d
ex
code out o
f
builtin-p
a
ck-objec
t
s
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-01
Jeff
K
in
g
allow git-am to run in a subdirectory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-01
Jeff King
rena
m
e:
w
arn user when we have turned off
r
ename de
t
ection
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-01
Mike
Hommey
A
dd test for
git rebase --abor
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-01
Junio C Hamano
t6
0
2
4
:
move
"
git rese
t
"
to p
r
epare for a
t
e
s
t insid
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-01
F
r
a
n
k Lic
h
te
n
held
gc: Add --quie
t
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-01
P
h
i
l
ippe Bruhat
.
.
.
cvsimport: document that
-
M can
be
used
m
u
ltiple times
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-01
Philip
p
e Bruhat
.
.
.
cvsimport:
a
llow for mul
t
iple -M opt
i
ons
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-01
Philippe Bruhat
.
.
.
cvsimport
:
hav
e
de
f
ault merge r
e
gex
allow
f
or dashes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-01
Junio C Hamano
Merge br
a
nch 'master' of git://repo
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-03-01
Junio C
Hamano
M
erge
b
ran
c
h
'
mai
n
t
'
commit
|
commitdiff
|
tree
2008-03-01
Mike Ral
p
h
s
on
Do
c
umentation c
h
erry-p
i
ck:
F
ix cut-and
-
paste error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-01
Rémi Vanicat
git
.
e
l
: find the git-statu
s
b
u
ffer wh
a
tever its name
is
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-03-01
Junio C
H
aman
o
Merge
branch 'm
a
int' of
g
it://
r
ep
o
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2008-03-01
Santi Bé
j
a
r
clone:
suppor
t
cloning f
u
l
l
b
un
d
l
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-29
Ju
n
io C Haman
o
Up
d
ate draft release note
s
for 1
.
5
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-29
Jeff K
i
ng
use
b
u
ild-time SHELL_PA
T
H i
n
t
e
st scrip
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-29
Daniel Barka
l
ow
Write in
d
ex file on any che
c
kout of file
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-29
Uwe Kleine-Kön
i
g
rev-l
i
s
t
:
add -
-
b
r
anches, --tags a
n
d --remot
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-29
Miklo
s
Vajna
I
m
prove
t
6
0
2
9 to check t
h
e real
"sub
t
ree" case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-29
Daniel Barka
l
ow
Use diff
_
t
ree() directly in making cover letter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-29
Daniel Barkalo
w
Al
w
a
y
s
use
t
he cu
r
ren
t
connection's remote ref
l
ist
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-29
J
u
nio C Hamano
t
e
sts: introduce test_must_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-29
Alex Riesen
Fix buil
t
in
c
h
eckout crashing when given an invalid
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-29
Junio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2008-02-29
Martin Koegl
e
r
r
e
c
eive-pack: use
st
r
ict m
o
de for u
n
pac
k
i
ng o
b
jects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-29
Ma
r
tin Koegler
i
ndex
-
p
a
c
k
:
i
n
t
roduce chec
k
ing
m
ode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-29
Martin Koegler
un
p
ack-objec
t
s:
p
r
event writin
g
of inconsistent o
b
je
c
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-29
Ma
r
tin
Koegler
unpack-object: cac
h
e
for non wr
i
tten objec
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-28
Shawn O
.
Pearce
T
e
ach git-de
s
cribe to v
e
rify a
n
not
a
ted
t
a
g name
s
bef
o
re
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-28
Ge
r
ri
t
Pape
templa
t
es/Makefile: don'
t
depend on local umask s
e
t
t
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-28
D
aniel
Barkalo
w
Corr
e
c
t n
a
me of
d
i
ff_flush
(
) in API documentat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-28
J
u
nio
C
H
a
m
ano
S
tart preparing for
1
.
5
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-28
Junio C Ha
m
a
n
o
f
o
rmat-patch: remo
v
e a leftover debugging messag
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-28
J
o
han
n
es Sch
i
ndelin
completi
o
n: support
fo
r
mat-patch's --cover-let
t
e
r
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-27
J
u
nio C Hama
n
o
Fix "
g
it log
-
-merge --left-ri
g
ht"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-27
Clemens B
u
c
h
ac
h
er
http-
p
us
h
: add regression tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-27
Clem
e
ns
Buchacher
htt
p
-push
:
pu
s
h
<
remote
>
:<branch>
deletes remote br
a
nch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-27
Mike Homm
e
y
Set proxy override with http_init()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-02-27
Johannes Sixt
dae
m
on: ensure that base-path i
s
an ex
i
sting dire
c
tor
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next