repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
bash: Add completion for git diff --base --ours --theirs
2008-04-22
Te
e
mu Likonen
ba
s
h: Add completion f
o
r git dif
f
--bas
e
--
o
urs --theirs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-22
Gerrit Pape
diff-optio
n
s
.
txt
:
documen
t
t
h
e n
e
w "--
d
irstat"
o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-20
Junio C
H
amano
GIT 1
.
5
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-20
J
u
nio C Hamano
Mer
g
e
b
ranch
'jc/m
a
int-rebase-am' into maint
commit
|
commitdiff
|
tree
2008-04-19
Jakub Narebski
gitweb:
Fix 'history' view for del
e
ted
f
iles
w
ith
h
ist
o
ry
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-19
Matthieu Moy
Document that WebDAV doesn't
n
eed
g
it o
n
the server
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-19
J
un
i
o C Hamano
Merg
e
branch 'maint-1
.
5
.
4
'
into maint
commit
|
commitdiff
|
tree
2008-04-18
Jonas Fo
n
seca
git-r
e
m
o
t
e: reje
c
t a
d
d
i
ng rem
o
tes with invalid names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-18
Ju
n
io C Ham
a
no
am:
POSIX p
o
r
t
ab
i
lity fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-17
Junio C Haman
o
Merge branch
'
maint-1
.
5
.
4
'
into
m
aint
commit
|
commitdiff
|
tree
2008-04-16
Junio C H
a
m
ano
git-am: mi
n
o
r
cleanup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-16
J
on Loeliger
Clari
f
y
a
nd fix
E
nglish in "git-
r
m"
d
ocumentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-16
Junio C Ha
m
ano
rebase
:
do not munge commi
t
log m
e
ssage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-16
J
u
ni
o
C H
a
mano
Merge branch 'maint-1
.
5
.
4' into maint
commit
|
commitdiff
|
tree
2008-04-16
Ch
r
istian Couder
git-bisect:
m
ak
e
"start", "
g
ood" and "sk
i
p" succeed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-16
Linu
s
Torv
a
ld
s
git-am: c
o
pe bett
e
r wi
t
h an empty Sub
j
ect: line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-16
Lin
u
s
T
orvalds
Ignore leading
e
m
pt
y
lines while summarizing merge
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-16
Christian Couder
bis
e
ct: sq
u
e
l
c
h "fata
l
:
r
ef HEAD
not
a
symref
"
misleadi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-16
Alberto Bert
o
gli
builtin-apply:
S
how a more des
c
riptive error o
n
f
a
ilure
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-16
Scott Collins
Clarify documentation of
g
it-cvsserver, partic
u
larly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-15
Shawn Bohrer
git cle
a
n: Add test to verify dir
e
c
t
ories aren't removed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-15
Sha
w
n Bo
h
r
e
r
git clea
n
: D
o
n't
a
utomatically remove directories when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-15
Mark Lev
e
d
ahl
git
-
submodule - possibl
y
use branch nam
e
to describe
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-13
Junio C Hamano
t7401: squelch garbage
output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-13
J
u
nio C Hamano
Docume
n
ta
t
ion/git-subm
o
dul
e
: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-12
Daniel Barkalow
Fi
x
c
onfig key miscount in url
.
*
.
insteadOf
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-12
J
unio C Hama
n
o
Merge branch 'maint-1
.
5
.
4'
i
nto maint
commit
|
commitdiff
|
tree
2008-04-12
Clifford Caoile
D
o
cs
g
itk:
E
x
p
lic
i
tly mention th
e
fil
e
s
tha
t
gitk uses
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-12
Ju
n
i
o
C Hamano
Do
c
ume
n
t -w opt
i
on to
sh
o
rt
l
og
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-12
Chr
i
s
tian Couder
b
i
sect: r
e
port bad rev bet
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-12
Junio C Hamano
Merge branch '
m
aint-1
.
5
.
4
'
into maint
commit
|
commitdiff
|
tree
2008-04-12
Chr
i
sti
a
n Couder
b
i
s
ect
:
fix b
a
d rev checking in "git bisect good"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-12
Michele Ballab
i
o
revision
.
c:
m
ake --date-order overrid
d
able
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-12
Ping
Y
in
git-submodule:
Avoid 'fatal: cannot describe' mes
s
age
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-12
Pe
d
ro
Melo
Force the medium p
r
etty f
o
rmat on calls to git lo
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-12
B
j
ör
n
Ste
i
nbri
n
k
F
ix
s
ection about backdating tags in the git
-
tag docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-11
Johannes Sixt
D
o
c
u
ment
o
ption
-
-only of git com
m
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-11
Dirk Suesse
r
o
tt
Documentation/git-request-
p
ull
:
Fix
e
d a typo ("
s
end
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-10
Je
f
f Ki
n
g
git-fe
t
ch:
fix status o
u
tput
w
hen
n
ot s
t
oring tracking ref
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-10
Junio
C
Hamano
Mer
g
e branc
h
'maint-1
.
5
.
4'
i
n
t
o maint
commit
|
commitdiff
|
tree
2008-04-10
Carlos Rica
cor
e
-tutorial
.
t
x
t:
F
ix
s
ho
w
ing the
c
u
rre
n
t
behavi
o
u
r
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-10
René Scharfe
git-archi
v
e:
i
gnore prefix w
h
e
n
checking file a
t
tribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-10
Carlos
Rica
Fi
x
documentat
i
on sy
n
ta
x
of optional
arguments in
sh
o
r
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-08
Ju
n
i
o
C
Hamano
GIT 1
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-08
Junio C H
a
ma
n
o
Merge git://
g
it
.
k
e
rnel
.
org/pub/
s
c
m
/gitk/g
i
tk
commit
|
commitdiff
|
tree
2008-04-07
Eric Won
g
g
i
t-svn: fix fol
l
o
w
ing
re
n
amed pa
t
hs when track
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-07
Ju
n
io C Hamano
M
e
rge branch
'jc/maint-apply-match-beginning'
commit
|
commitdiff
|
tree
2008-04-07
Pascal Obry
A
dd prefix orien
t
e
d completions for diff
and forma
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-07
Ch
r
istian Co
u
der
test suite: r
e
move
u
seless T
E
RM cruft in "t7005-editor
.
sh"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-07
Pascal Obry
Add interacti
v
e option in rebase command complet
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-07
Junio C Hamano
Fix
"
git app
l
y" to corre
c
tly
enfor
c
e "match at the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-07
Peter Erikse
n
Add de
s
cription of
O
FS_D
E
LT
A
to the pack format d
e
scrip
t
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-05
Peter Eriksen
git-pac
k
-
objects
.
txt: Make wording slightly l
e
s
s
ambiguo
u
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-05
Kevin Ballard
git-f
e
tch: Don't trigger a b
u
s
error
when gi
v
en
t
h
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-05
Jakub Narebski
R
e
vert "
g
itweb
:
Add 'statu
s
_str' to pa
r
se_difftree_raw_lin
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-05
J
unio C Hama
n
o
Merge git://r
e
po
.
or
.
c
z
/git-gu
i
commit
|
commitdiff
|
tree
2008-04-02
Junio C Hamano
GIT
1
.
5
.
5
-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-02
Junio C
Hamano
Merge bran
c
h
'
js/filt
e
r-bra
n
ch'
commit
|
commitdiff
|
tree
2008-04-02
T
e
e
mu Lik
o
nen
Describe the bu
g
i
n handling filenames with
funny
charact
e
rs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-02
Junio C Hamano
Merge g
i
t://repo
.
or
.
c
z/git-gui
commit
|
commitdiff
|
tree
2008-04-02
Junio C
Hamano
Merge branch 'bc/mkta
g
'
commit
|
commitdiff
|
tree
2008-04-02
Junio C
H
a
mano
Merge
b
r
a
n
ch 'pb/
c
vss
e
rver'
commit
|
commitdiff
|
tree
2008-04-02
Juni
o
C Hamano
Mer
g
e
branch
'
dd/cv
s
server'
commit
|
commitdiff
|
tree
2008-04-02
Junio
C Hamano
Merge branch 'je/
c
vss
e
rver'
commit
|
commitdiff
|
tree
2008-04-02
Johann
e
s Sixt
t7004-tag: Skip more tests if gpg is n
o
t available
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-02
Johann
e
s
Sixt
verify-tag: Clean u
p
the temporary fi
l
e i
f
g
p
g c
a
n
n
o
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-02
Christia
n
Couder
help: Add a
m
issing OP
T
_
E
ND()
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-02
Ju
n
io C Hamano
Ac
c
ept git a
l
i
ases outside a git
r
e
po
s
itory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-04-01
Brando
n
Casey
mktag
.
c:
t
w
ea
k
validatio
n
of tagg
e
r fi
e
ld and adjust
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-31
v
eil
l
ette@yahoo
.
c
a
f
i
l
ter
-
br
a
nch
:
Fix
renaming a
d
irectory in the tre
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-31
Johannes Sixt
filter
-
br
a
nc
h
: Test r
e
n
a
ming direc
t
ories in a
t
ree
.
.
.
commit
|
commitdiff
|
tree
2008-03-31
Brandon Casey
mktag
.
c:
improve ve
r
ificatio
n
of
t
agger fi
e
l
d
and t
e
sts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-31
Junio
C H
a
mano
d
iff
-
f
iles: car
e
f
u
l when inspecting work tree items
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-31
Ju
n
io C H
a
m
a
no
diff-index: careful whe
n
insp
e
cting work tree
i
tems
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-31
Junio
C
Hamano
Add
corner ca
s
e
t
ests for diff-index an
d
di
f
f-fi
l
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-31
Josh El
s
asser
A
llow git-c
v
sserver database table nam
e
prefix t
o
be
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-31
Bryan Donlan
S
i
lence cpio's
"N
b
locks"
output when cloni
n
g locally
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-31
Eric Wong
git-svn: r
e
m
o
ve redundant slas
h
es f
r
om show-
i
gno
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-28
Paolo Bonzini
git-cvsserver: handle change
type T
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-28
Junio C Hama
n
o
G
I
T
1
.
5
.
5-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-28
Junio
C
Ha
m
ano
GI
T
1
.
5
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-27
Damien Diederen
cvsserver
:
U
se the user part of th
e
email in log a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-27
Damien
Diederen
c
vsser
v
er: Add tes
t
for update -p
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-27
Damien D
i
edere
n
cvsserv
e
r: Implem
e
nt update -p
(
print to st
d
o
u
t)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-27
Damie
n
Diederen
cvsse
r
ver: Add a few tests
for 'status' com
m
and
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-27
Dami
e
n Diederen
cvsserver:
Do
n
ot incl
u
d
e
stat
u
s o
u
tput for
subdirector
i
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-27
Damien
Diederen
cvsserver: Only print th
e
f
i
l
e
part of the filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-27
D
amien Diederen
cvss
e
rver: Respond to the '
e
ditor
s
' and 'watchers'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-27
Jun
i
o
C
Hamano
built
i
n-prune: protect objects listed on the
c
ommand
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-27
Michele Ballabio
b
uiltin-
p
run
e
.
c: us
e
par
s
e_op
t
ions
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-27
Michele Ballabio
Add tests for git-prune
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-27
Michele Ballabio
p
a
rse-options
.
c: i
n
troduce OPT_DATE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-27
Junio C
Hamano
U
p
d
ate dr
a
ft release no
t
es for 1
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-27
Junio C
H
am
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-03-27
J
unio C Hamano
Update draft
release notes for 1
.
5
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-27
J
u
nio C Ha
m
ano
Merge bra
n
c
h 'jc/mai
n
t-fetc
h
-r
e
gress
i
on
-
1
.
5
.
4
'
into
.
.
.
commit
|
commitdiff
|
tree
2008-03-27
Jeff King
D
o
cumen
t
atio
n
: c
l
arify
use of
.
git{
i
gnore,attrib
u
te
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-27
Junio
C Hamano
tes
t
_
must_fail:
1
29
i
s
a v
a
l
id er
r
o
r code from usage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-26
Gerrit Pape
im
a
p
-send: p
r
operly
err
o
r ou
t
if ima
p
.
host is not se
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-26
Frank Li
c
htenheld
t9600
-
c
v
simp
o
rt
.
sh: set HO
M
E before che
c
king for cvsps
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next