repo.or.cz
/
git
/
mergetool.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
gitweb: Don't use Content-Encoding: header in git_snapshot
2006-12-12
Jakub Narebski
gitw
e
b: D
o
n't use C
o
nten
t
-E
n
coding:
header i
n
git_snaps
h
ot
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Ju
n
io C
Hama
n
o
shor
t
log:
fix seg
f
au
l
t
o
n
empty auth
o
rn
a
me
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Ju
n
i
o
C
Hamano
s
hortlog: r
e
move "[PATCH]" pr
e
fix
from s
h
o
rtlog ou
t
put
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-11
Sh
a
wn O
.
Pearce
Mak
e
sure the empty tree
e
xists when needed in merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
J
im Mey
e
ri
n
g
Don't
u
se memcpy when
s
ource
a
n
d
dest
.
b
uf
f
ers ma
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Ch
r
is Wright
no need to i
n
stall manpages as
executable
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
J
.
Br
u
ce Fie
l
ds
Documentation: s
i
mpler shared repos
i
t
ory creation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Jeff King
shortlog: fi
x
s
egfault
on empty
a
u
t
h
o
r
n
a
me
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Josef Weiden
d
o
rfer
Add
b
ranch
.
*
.
merge warning
a
nd documentation update
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Junio C
Hamano
F
ix perl/
b
uild
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Eric Wong
git-svn: use d
o
_switch for --follow-p
a
rent if
the SVN
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Uwe Zeisb
e
r
ger
Fi
x
d
oc
u
m
e
n
t
a
t
ion copy&
p
aste t
y
po
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Er
i
c Wong
git-svn: extra error check
t
o ensur
e
we open a file
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
J
.
Bruce Field
s
Docume
n
tati
o
n: update git-clone ma
n
page
w
ith new
b
ehavior
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
Junio C Hamano
Merge
bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2006-12-07
Martin L
a
nghoff
cv
s
server
:
A
void mi
s
counting by
t
es in Perl v5
.
8
.
x
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
N
icolas Pitre
ch
a
nge
the
unpa
c
k li
m
it treshol
d
t
o a saner va
l
ue
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
J
.
Bru
c
e
F
ields
Documenta
t
i
on: reorganize cvs-migration
.
txt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio
C
Hamano
git-merge
:
fix "fix confusion between
t
a
g and br
a
nch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
E
r
ic
W
ong
git-
s
vn: avoi
d
ne
t
work tim
e
o
uts for long-r
u
n
n
ing f
e
tches
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
a
kub Nare
b
ski
git
w
eb
:
Allow PNG, GIF, JPEG i
m
ages
t
o be d
i
splayed
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
unio C Hamano
git
-
merge:
s
q
u
elch
needless error
message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C H
a
mano
M
erge
commit
|
commitdiff
|
tree
2006-12-06
J
u
nio C Ham
a
no
M
e
rge branch '
m
aint'
commit
|
commitdiff
|
tree
2006-12-06
Junio
C
H
a
mano
git-rese
t
to rem
o
ve "$GIT
_
DIR/MERGE_M
S
G"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
.
Bruce Fi
e
l
d
s
cvs-mi
g
ra
t
ion:
im
p
roved section titles, better pu
s
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Johann
e
s Schindelin
cvs-migration do
c
u
m
e
nt: mak
e
the need for "p
u
sh" more
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Jakub Narebski
D
o
cum
e
n
t
gi
t
-diff whitesp
a
ce fla
g
s
-b
and -w
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Johannes Schindelin
di
f
f -b:
i
gno
r
e whi
t
espace
at end of line
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Ju
n
io C Hamano
Me
r
g
e branch '
m
aint
'
commit
|
commitdiff
|
tree
2006-12-04
J
unio C Hamano
unpack-trees: make sure "
d
f
_
con
f
lict_ent
r
y
.
name" i
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Junio C Hamano
receive-pack: do
n
ot insist o
n
f
ast-forward outsi
d
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Michael Loeffler
g
i
t-fetch
:
ignore deref
e
renced tags
i
n
e
xpan
d
_refs_
w
ildcard
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Jakub Narebski
g
i
t
-clone: Rename --use
-
im
m
ing
l
e
d-r
e
mot
e
option
to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Jak
u
b Narebsk
i
git
w
eb:
F
i
x Atom feed <
l
o
g
o>: it is
$
logo,
n
ot
$logo_ur
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Al
e
x
R
i
esen
Make perl/
b
u
i
ld procedure A
c
tive
S
tate friendly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
David Miller
Pass -M to diff in
reque
s
t-pull
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Jim Meyering
Set permiss
i
ons of each new f
i
le before "c
v
s a
d
d
"ing
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
J
oha
n
nes Schindeli
n
gi
t
-mv: search
more
p
recisely for source directory
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-03
Eric Wong
git
-
s
v
n
:
av
o
id
f
etching files twice in the sam
e
revision
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
git-
m
erge: fix confusion b
e
tw
e
en tag and branch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-02
An
d
y
P
arkin
s
D
e-e
m
ph
a
s
ise the sym
b
olic link do
c
ument
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-02
Andreas Ericsson
git-d
i
ff: Introduce --index and d
e
precat
e
--c
a
ched
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-02
An
d
re
a
s Eric
s
son
ls-files: G
i
ve
h
ints when err
o
rs
happen
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-30
Nicolas
P
itre
pac
k
-objects: remove redundent stat
u
s information
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
Merge master
.
k
e
rn
e
l
.
org:
/
pub/scm/gitk/
g
itk
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2006-11-29
A
n
dy Parkins
Docum
e
n
t
git-repo-config --bool/--int option
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio C H
a
mano
tutorial: talk about
u
ser
.
name early and do
n
't
s
tart
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Alex Ri
e
sen
git-blame: fix rev parameter h
a
ndling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Jun
i
o
C Hamano
Merge bra
n
c
h 'jc/globfetch'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Ha
m
ano
git
b
l
ame
-C: fix output
f
ormat tweaks when crossin
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
E
ri
c
Wong
git-
s
vn: fix
m
ult
i
-init
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Eric
W
ong
git-svn: documentation updates
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
E
r
ic Wo
n
g
git-svn: colo
r
support for t
h
e log command
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
H
a
n
-Wen Nienhuys
iden
t
.
c
: Tr
i
m hint printed when
g
e
cos is empty
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Shawn O
.
Pearce
F
i
x b
r
oken
b
a
sh compl
e
tion of local r
e
fs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Sha
w
n
O
.
Pe
a
rce
Teach bash
how to com
p
lete
l
on
g
o
p
tion
s
for git-commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wong
gi
t
-
svn: fix output repor
t
ing from the del
t
a fe
t
cher
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wong
g
i
t-svn: e
r
ror out when t
h
e
S
VN connec
t
ion
f
ails during
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
René Scharfe
shortl
o
g
:
remove range che
c
k
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Er
i
c Wong
git-
s
vn: update tests f
o
r recent changes
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wong
git-svn: en
a
b
l
e delta transfers
d
ur
i
n
g
fetches
w
hen
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Andy
P
a
rk
i
n
s
U
s
e
.
git/config
for
s
tori
n
g "origin" shortcut repositor
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Johannes S
c
hindelin
sha1_object_info(): be con
s
ist
e
nt wit
h
read_sha1_fil
e
()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Johannes Schindeli
n
shor
t
log: use
p
ager
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
c
v
s
import:
style
f
i
xu
p
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Eric
W
o
n
g
git-svn:
use ~/
.
subversio
n
config files when using
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sh
a
wn O
.
Pear
c
e
Teach ba
s
h about git-
a
m/git-a
p
ply an
d
th
e
ir
w
hite
s
pace
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Cache the list of merge st
r
at
e
gies a
n
d ava
i
lable c
o
m
mands
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
S
h
a
wn O
.
P
ea
r
ce
Suppor
t
--strategy=x c
o
mp
l
etion in addition to --st
r
at
e
gy x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn
O
.
Pearce
T
each
b
as
h
about gi
t
-repo-confi
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
S
u
ppo
r
t
bash c
o
mplet
i
on of ref
s
/rem
o
t
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
T
each bash ab
o
ut git log/s
h
o
w
/w
h
atchang
e
d options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pea
r
ce
Teach bash h
o
w to complet
e
git-rebase
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teach bash how
to
comp
l
e
t
e
gi
t
-cher
r
y
-
pick
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Tea
c
h bash how to
c
o
m
p
l
et
e
git-format-patch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn
O
.
P
earce
A
d
d
current
b
r
a
n
c
h in
P
S1 sup
p
ort
to git
-
completion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teac
h
b
a
sh how
to comple
t
e opt
i
o
n
s for git-name-rev
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sha
w
n
O
.
Pearce
Hide plumbing/t
r
a
n
s
port commands from bas
h
c
o
mpletion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sha
w
n O
.
Pearce
Teach git-completio
n
.
bash
h
ow
to
com
p
le
t
e gi
t
-merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sean
Update
document
a
t
i
on to rem
o
v
e
incorrect GIT_DIFF
_
OPTS
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Ju
n
io C Hamano
Merge branch 'j
s
/shor
t
log'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hama
n
o
Merg
e
branch 'jc/push-de
l
et
e
-re
f
'
commit
|
commitdiff
|
tree
2006-11-27
Ju
n
i
o
C Hamano
M
e
rge branch
'jc/merge'
commit
|
commitdiff
|
tree
2006-11-27
J
u
nio C Ha
m
a
n
o
g
i
t-me
r
ge:
d
o not leak rev-parse output
used for
checki
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio
C
H
a
mano
g
i
t-merge:
t
i
ghten error ch
e
c
k
ing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Ju
n
io C
Hamano
Merge branc
h
'jc/p
a
ck-peeled'
commit
|
commitdiff
|
tree
2006-11-26
Junio C Hamano
grep: d
o
n
ot skip unme
r
g
e
d
entries
w
hen g
r
e
p
p
ing in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-26
H
a
n-Wen Nienhuys
gi
t
-
t
ag: al
l
ow e
m
p
ty tag mes
s
age if -
m
is given
explici
t
ly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-26
Junio C
Hamano
Merge branch
'
j
n
/w
e
b'
commit
|
commitdiff
|
tree
2006-11-26
J
.
Bru
c
e
F
ield
s
Docume
n
tation: cla
r
if
y
tu
t
orial pull
/
merge discussion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-26
J
a
kub Narebski
gitwe
b
:
Ma
k
e
project
description in projects
l
ist link
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-26
Eric Wo
n
g
git-svn: allow SVN:: lib users to track
t
h
e root
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Jakub Narebski
g
i
twe
b
:
Use auth
o
r_
e
poch for pub
d
ate
i
n g
i
t
web f
e
eds
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Jakub Narebski
gitweb:
A
dd author
a
nd contributor email to Atom feed
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Ja
k
ub Narebski
git
w
eb: A
d
d author and c
o
mmitter
e
mail extracti
o
n to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next