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-03-26
SZED
E
R
G
á
bor
Alw
a
ys set *nongit_ok i
n
setup_git
_
dir
e
ctory_ge
n
tly()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-26
Bran
d
on Casey
t/t3800
-
mktag
.
sh: use test_must_fail rath
e
r
tha
n
'!'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-26
J
u
nio C Hama
n
o
Merge bran
c
h 'jc/maint-fet
c
h-regre
s
sion-1
.
5
.
4'
commit
|
commitdiff
|
tree
2008-03-26
Junio
C
Hamano
git-fet
c
h
test: t
e
s
t
tra
c
king fet
c
h
r
esults, not just
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-26
D
an
i
el Barkal
o
w
F
i
x branches file configur
a
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-26
Dani
e
l Bar
k
alow
Tighten refspec
process
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-26
Gu
a
nqun Lu
Fix
the wrong outp
u
t of `git-show v1
.
3
.
0~155^2~4` in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-26
J
unio
C
Ham
a
no
refs
p
e
c
: allow colon-le
s
s
wildca
r
d
"refs/category/*"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-25
Johannes Schindelin
ini
t
: s
h
ow "Reinit
"
messa
g
e e
v
en
i
n an (ex
i
sting) empty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-25
Jul
i
an Phil
l
ips
Documentation/git-checko
u
t
:
Upd
a
t
e
s
u
mmary to reflect
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-25
D
ir
k
Sü
s
serot
t
Docum
e
n
t
ati
o
n: git-tag '-m'/'
-
F' implie
s
'-a'
commit
|
commitdiff
|
tree
2008-03-24
Johannes Sixt
bui
l
tin-remote: Fix m
i
s
s
ing newline at end o
f
listing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-23
Gua
n
qun
L
u
Fix th
e
wrong output
o
f `git-show
v1
.
3
.
0~155^2~
4
`
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-23
Joha
n
ne
s
S
chindelin
RelNotes: mention checkout/b
r
anch'
s
--t
r
ack optio
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-23
Junio C
H
a
mano
GIT 1
.
5
.
5-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-23
Junio
C
Hamano
gc --auto: raise default auto
p
ack limit fr
o
m
2
0
to 5
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-23
Ju
n
io C Haman
o
Merge branch 'git-p4' of git:
/
/
r
e
po
.
o
r
.
c
z
/git/git-p4
commit
|
commitdiff
|
tree
2008-03-23
J
unio C Ha
m
ano
re
m
ote
.
c: Fix overtigh
t
r
e
fspec
validation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-23
Eyvind Bernha
r
dsen
fast-
i
mport: Doc
u
ment th
e
effect of "merge" with no
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-23
Kevi
n
Ballard
Make
git-sv
n
test
s
beha
v
e better on OS X
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-23
Ralf Wilde
n
hues
I
mprove descript
i
on of
git filte
r
-branch
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-23
Brandon Casey
t
/
t
70
0
3-
f
i
l
ter-branc
h
.
sh:
u
se tes
t
_mu
s
t_f
a
il rather
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-21
Kevin B
a
llard
D
o
n
't try
a
nd
p
ercent
-
escape existing percent escapes
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-20
J
o
ha
n
ne
s
Schi
n
delin
remo
t
e
sho
w
: do not show
s
ymbolic
refs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-20
Ke
v
in
Ballard
Do
c
um
e
nt
the se
n
dema
i
l
.
smtpserverport config variable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-20
Kevin
B
allard
Add --reve
r
s
e
t
o the
g
i
t-rev-list usage string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-20
N
icolas P
i
tr
e
make
i
t easier
f
or people who just wan
t
to get r
i
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-20
Brando
n
Casey
builti
n
-gc
.
c: allow di
s
ablin
g
all
auto-gc'ing by assigning
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-19
Mi
k
los Vaj
n
a
Documenta
t
ion/g
i
t-merge: document s
u
btree stra
t
egy
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-19
Dan
i
el Bark
a
l
ow
Fix tag
f
oll
o
win
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-19
Linu
s
Tor
v
alds
Make re
v
ision limiting mor
e
ro
b
ust against occasional
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-19
Dan
i
el B
a
rkalo
w
Fix
t3200
c
onfig
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-19
D
a
niel Barkalow
Tighten refspec processi
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-19
Linus T
o
rvalds
Fix possible Solaris
p
rob
l
em i
n
'checkou
t
_entry()
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-19
Junio C Hama
n
o
Fix read-tree not to discard errors
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-19
Ju
n
io C Hamano
Add tes
t
s to catch
prob
l
e
ms
with
un-unlinkable symlinks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-19
Junio C Hamano
Test: catch if trash can
n
ot be removed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-19
Jun
i
o C Hamano
git-merge-one-file: fix longstanding stupid th
i
nko
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-17
J
uni
o
C
H
amano
M
e
rg
e
branch 'j
c
/makefile'
commit
|
commitdiff
|
tree
2008-03-16
Linus Torvalds
D
on't up
d
ate
u
n
changed merge entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-16
Eyvind
Bernhardsen
f
a
st-import:
A
l
l
ow
"
reset" to
de
l
ete a ne
w
branc
h
wi
t
hout
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-16
Junio C Ham
a
no
t1000:
u
se "test_m
u
st
_
fail g
i
t fr
o
tz", not "! gi
t
f
rotz"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-16
Ju
n
io C Hamano
Up
d
ate draft release notes for
1
.
5
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-16
J
unio C Hamano
Resurrect git-r
e
rere t
o
contrib/ex
a
m
ples
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-16
Junio C Ham
a
n
o
Merge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2008-03-16
Junio C Hama
n
o
Start draft Re
l
e
a
se
N
otes for
1
.
5
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-16
J
unio C H
a
mano
rebas
e
-m: do not
trigg
e
r p
r
e-com
m
it verif
i
cation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-16
Junio C Hama
n
o
Mer
g
e
b
r
anch '
m
aste
r
'
of git://repo
.
o
r
.
c
z
/gi
t
-
gui
commit
|
commitdiff
|
tree
2008-03-15
Junio C Hamano
Redo
"add
t
est_cmp function
for test scripts"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
Junio C
H
amano
Merge
branc
h
'
jk/porta
b
le'
commit
|
commitdiff
|
tree
2008-03-15
Ju
n
io
C
Hamano
Merge branch 'py/
s
ubmodule
'
commit
|
commitdiff
|
tree
2008-03-15
Jun
i
o C Hamano
Merge b
r
anch 'db/diff-
t
o-fp'
commit
|
commitdiff
|
tree
2008-03-15
Junio C Haman
o
Merge branch
'
cc/help'
commit
|
commitdiff
|
tree
2008-03-15
Jonas
Fon
s
eca
shortlog: do not requ
i
r
e to run from inside a gi
t
r
e
pository
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
Jun
i
o
C Hamano
Mer
g
e
branch 'maint
'
commit
|
commitdiff
|
tree
2008-03-15
Junio
C
H
amano
f
o
r
mat-patch: generate MIME
h
eader
as need
e
d
even when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-03-15
Jo
n
as F
o
nseca
M
ake man page
bu
i
lding
quiet
w
h
e
n
DOCBOO
K
_XSL_172 is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
Bern
t
Hans
e
n
git-
n
e
w-workdir:
S
hare SVN meta d
a
ta between work dirs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
Linus Torvalds
Fi
x
rec
e
n
t '
u
npa
c
k_trees()'-related chan
g
e
s bre
a
k
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
Linus
Torvalds
rev-parse:
fix
m
eaning o
f
rev~ vs rev~0
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
Eric
W
ong
git-svn: don't blindly ap
p
end '*' to branch/tags conf
i
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-15
Jeff King
t6000lib: re-fix tr portab
i
lity
commit
|
commitdiff
|
tree
2008-03-15
Junio C Hamano
Merge g
i
t://git
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2008-03-14
Kristian Høgsberg
wt-status
.
c: no need for
d
up() dance anymore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-14
Dan
i
el Barkalow
W
rite d
i
ff output to a fi
l
e in s
t
ruct
diff_opt
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-14
Ch
r
istian Coud
e
r
Doc
u
m
ention: web--browse
:
a
d
d
info
a
bout
"
browser
.
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-14
Ch
r
istian
C
o
ud
e
r
web
-
-brows
e
: use
custom comman
d
s de
f
ined at confi
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-14
Junio C Hamano
Merge branc
h
'mr/autoconf
-
fread'
commit
|
commitdiff
|
tree
2008-03-14
Junio C
Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-03-14
Junio C
Ha
m
ano
Merge
b
ranch 'ph/ma
i
nt-quiltimport' into maint
commit
|
commitdiff
|
tree
2008-03-14
Junio C Hamano
read-tree() and un
p
ack_tr
e
es():
use cons
i
stent limit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-14
Jo
h
annes Sch
i
ndelin
merge-
f
ile: han
d
le empty f
i
les gracefu
l
ly
commit
|
commitdiff
|
tree
2008-03-14
C
l
e
mens B
u
chacher
merge-
r
ecursive: handle
file mode
c
h
a
n
g
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-14
Nicolas P
i
tre
pack-o
b
jects: prope
r
pack time stamping with --max
.
.
.
commit
|
commitdiff
|
tree
2008-03-14
Vi
n
eet Kum
a
r
Mi
n
o
r
wording
chang
e
s in the keyboard description
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-14
Junio C Ham
a
no
Documen
t
ati
o
n/git-help: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
t7505: use SHELL_P
A
TH in
h
ook
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Jeff
King
t911
2
: ad
d
missin
g
#
!/bin/s
h
header
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
f
il
t
er-branch: us
e
$SHELL_
P
ATH instead o
f
'sh'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Jeff Kin
g
filter
-
b
r
anch
:
don't use xarg
s
-0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Jeff K
i
ng
add NO_EXTERNAL_GREP b
u
ild
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
J
e
ff King
t6000lib: tr portability fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
t4020: don't use grep -a
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Jeff King
a
d
d
test_cmp f
u
nc
t
ion for
te
s
t sc
r
ipts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Jeff
King
remove use
o
f "tail -n 1" and "tail
-1"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
J
e
ff K
i
ng
grep portability fi
x
: don't use
"
-e" or "-q"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
J
eff King
more tr portabili
t
y
t
est script fixe
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
J
eff King
t0050: p
e
rl portabi
l
ity
f
ix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Johann
e
s Schinde
l
in
git fetch: Take '
-
n' to mea
n
'--no-tags'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Junio C Ha
m
ano
Merge b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2008-03-13
J
ohannes Schindelin
g
c
: call
"
p
rune --expire 2
.
weeks
.
a
g
o
"
by defa
u
lt
commit
|
commitdiff
|
tree
2008-03-13
Junio C Hamano
Do
c
umentatio
n
/con
f
ig: typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Chris
t
ia
n
Couder
he
l
p: warn if specified 'm
a
n
.
viewer' is unsupported
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
C
hristian Couder
Documentation: h
e
lp: explain 'man
.
viewer'
m
u
ltiple
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Jeff Kin
g
tr portab
i
l
i
ty fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Junio C Ham
a
no
quilti
m
port: fix misquo
t
in
g
of parsed -
p
<num>
p
arameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-13
Ma
r
c-Andre L
u
rea
u
git-cvsimport:
f
i
x
merging with remo
t
e parent bran
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Ja
k
ub
Narebski
gitweb: Fix bug in href(
.
.
.
,
-replay=>1) whe
n
using
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-03-12
Junio C Hamano
Ma
k
efil
e
:
flatte
n
enumeration of
h
eaders, objects and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next