repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add builtin merge-file, a minimal replacement for RCS merge
2006-12-06
J
o
h
annes
S
chind
e
lin
A
dd
b
uilti
n
merge-file, a min
i
mal
r
epla
c
eme
n
t for RCS
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
J
o
h
ann
e
s S
c
h
i
ndelin
xdl_merge(): fix and s
i
mplify conflic
t
han
d
ling
commit
|
commitdiff
|
tree
2006-12-03
J
o
han
n
es
Schin
d
elin
xdl_merge
(
): fix thinko
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
J
o
ha
n
n
es Schin
d
e
lin
xdl_
m
erge():
fi
x
an off-b
y
-one bug
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio
C
Hamano
merge-recursiv
e
: use xd
l
_m
e
rge()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Juni
o
C Hamano
x
m
e
r
ge: m
a
ke
retur
n
v
alu
e
from xdl_merge() more usable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Johannes Schindelin
xdiff: add xd
l
_merge(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C
Hamano
Merge br
a
n
c
h
'
maint'
commit
|
commitdiff
|
tree
2006-12-03
Eri
c
Wong
g
i
t
-svn: avoid fetching files tw
i
ce i
n
the same revision
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Ha
m
ano
git-m
e
rge: f
i
x
c
onfusion between
tag an
d
branc
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-02
Andy
Parkins
De-emphasise the symbolic link documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-02
Andreas Ericsson
git-dif
f
: Introduce --index and d
e
p
r
ecate --cached
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-02
A
n
drea
s
Ericss
o
n
ls-files: Give
h
ints when errors h
a
ppen
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-30
Nicol
a
s Pitre
p
a
ck-objects
:
r
e
mo
v
e r
e
d
un
d
ent statu
s
in
f
ormatio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
Merge master
.
ker
n
el
.
org:/
p
ub/sc
m
/gitk/
g
itk
commit
|
commitdiff
|
tree
2006-11-29
Juni
o
C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2006-11-29
Andy Parkins
Document git-repo
-
c
o
n
fig --bool/--i
n
t options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hama
n
o
tutori
a
l
:
talk ab
o
ut user
.
n
a
m
e early and don't
start
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Alex Riese
n
git-blame:
fix rev par
a
m
eter handling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio C
H
amano
Merge
b
ranch 'jc/globf
e
tch'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
Merge br
a
nch
'
main
t
'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hama
n
o
g
i
t blame -C: fix
o
u
t
put for
m
a
t
tweaks w
h
en crossing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Eri
c
W
ong
git-svn: fix
multi-i
n
it
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Eric Won
g
git-s
v
n: docum
e
ntation
u
p
d
ates
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Er
i
c W
o
ng
git-sv
n
: color support for the lo
g
command
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Han-We
n
N
i
enhu
y
s
ident
.
c: Trim hin
t
printed wh
e
n
gec
o
s i
s
empty
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Shawn
O
.
P
e
a
r
c
e
Fix broken b
a
sh com
p
letion of
l
oca
l
refs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
S
hawn O
.
Pearc
e
Teach bash how to complete long o
p
tions for git-
c
ommit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
E
ric Wong
git
-
svn: fix outpu
t
repor
t
ing
f
rom
th
e
delta fetcher
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Eri
c
Wo
n
g
git-svn: error out when
t
he
S
VN conne
c
tion fa
i
ls during
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
R
e
né
S
c
h
arfe
shortlog: remov
e
range check
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
E
r
ic Wong
git-svn
:
u
p
date
t
e
sts f
o
r recent changes
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Er
i
c Wong
git-s
v
n: en
a
b
l
e delt
a
transfers during fetches
whe
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Johanne
s
Schindelin
sha1_object_info(): be consistent with read_s
h
a1_f
i
le
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Johannes
S
chindelin
s
ho
r
t
log: use pager
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Jun
i
o
C Hamano
cvsi
m
port: styl
e
fixup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
E
ric
Wong
git-svn: use ~/
.
sub
v
ersio
n
conf
i
g files whe
n
usi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
S
h
a
wn O
.
P
e
arce
Te
a
c
h bas
h
a
b
o
ut git-am/git-apply and
their whitespac
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Cache the
lis
t
of mer
g
e
strategies and availa
b
le commands
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Support --strategy=x co
m
pletion i
n
addition to --strategy x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sh
a
w
n
O
.
Pe
a
rce
Teach bash
a
b
o
ut git-repo-config
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shaw
n
O
.
Pe
a
r
c
e
S
u
p
port bas
h
completion of refs/remote
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shaw
n
O
.
P
e
arce
Teach bash about git log/show/whatchanged options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shaw
n
O
.
Pearce
Teach
bas
h
how to complete git-r
e
base
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
ear
c
e
Teac
h
bas
h
how
to comp
l
ete g
i
t-ch
e
rry-pick
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sha
w
n O
.
Pearce
Teach bash how to
complete git-format-patch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
ear
c
e
Add current branch
i
n
PS1
s
upport to
git-completion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teach bash how t
o
comp
l
et
e
op
t
ions for git-name-r
e
v
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
S
hawn O
.
Pearce
Hide plumbing/transport c
o
mmands from ba
s
h comple
t
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teach git-completi
o
n
.
bash
h
o
w to complete git-
m
erge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sean
Upda
t
e
documentat
i
on
t
o r
e
mo
v
e
inc
o
rrect GIT_DIFF_OPTS
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Jun
i
o C Hamano
M
erge b
r
a
nch 'js/shortlog'
commit
|
commitdiff
|
tree
2006-11-27
Ju
n
io C
Hamano
Merge bra
n
c
h '
j
c/
p
ush
-
delete-ref'
commit
|
commitdiff
|
tree
2006-11-27
Junio C H
a
mano
M
erge
b
ranch
'
jc/merge'
commit
|
commitdiff
|
tree
2006-11-27
Jun
i
o C Hamano
git
-
m
erg
e
: do
n
ot leak rev-parse
output
used for chec
k
ing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Ju
n
io C Hamano
git-m
e
rge:
tighte
n
error checking
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C
H
aman
o
Merge branch 'jc/pack-pe
e
led'
commit
|
commitdiff
|
tree
2006-11-26
Junio C Hamano
grep: do not skip unm
e
rg
e
d entries wh
e
n greppi
n
g in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-26
H
an-Wen Nienhuys
g
i
t-
t
ag: allow empty t
a
g mess
a
ge if -m is given
e
xp
l
icitly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-26
Junio C Hamano
M
e
rg
e
branch
'
jn/web
'
commit
|
commitdiff
|
tree
2006-11-26
J
.
B
r
uce
Fields
Documen
t
ation: clarif
y
tutoria
l
pull/merge d
i
s
c
ussion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-26
Jakub Nareb
s
ki
gitweb: Make
p
ro
j
ect descr
i
ption i
n
projec
t
s list link
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-26
Eric Won
g
git-
s
vn: al
l
ow SVN:: lib use
r
s to track
the root of
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Jakub Narebs
k
i
g
i
t
web:
Use autho
r
_epoch
f
or pubdate in gitweb feeds
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Jak
u
b Narebs
k
i
gi
t
web
:
Ad
d
a
u
thor
and
c
o
n
t
ributor email to Atom feed
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Jak
u
b
Narebski
gitweb: Add author and committ
e
r email
e
xtr
a
c
t
ion to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
J
a
kub
N
arebski
g
itweb: Us
e
git
-
show-ref instead of
git-peek
-
remot
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Jaku
b
Narebsk
i
gitweb
:
Do not us
e
es
c
_htm
l
in
e
sc_path
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Ham
a
no
fe
t
c
h
-pack
:
d
o
not barf when duplic
a
te re pa
t
t
e
rns
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio
C Hamano
git-fet
c
h: a
l
low
f
o
rc
i
n
g g
l
ob pat
t
ern
i
n refspec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Juni
o
C Hamano
Merg
e
branch 'maste
r
' into jc/globf
e
tch
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
git-f
e
tch: exit with non
-
zero status whe
n
fast-forwa
r
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio
C H
a
mano
git-shortlog: make common r
e
posito
r
y p
r
e
fix config
u
rable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Jun
i
o C Hamano
g
it-shortlog:
fi
x
common r
e
pository prefix abbreviation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Eric Wong
git-
s
vn: exit w
i
t
h
status 1 for test failur
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
E
r
ic Wong
git
-
s
vn:
c
o
rrectly acc
e
s
s
r
e
p
o
s w
h
en onl
y
given partia
l
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Jun
i
o C Hamano
g
i
t
-br
a
nch -D: make
it work even when on a yet-
t
o-be
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
L
a
rs Hjeml
i
Add -
v
and --abbrev
options to git-branch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Ha
m
ano
gi
t
-clone:
stop dumb protocol from copyi
n
g refs o
u
tside
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
gitweb: (s
t
yle) use chomp without par
e
ntheses consistentl
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Jakub Narebski
gitweb: Replace SPC with
also in ta
g
co
m
ment
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio
C Hamano
A
l
low
g
it
p
us
h
to de
l
e
t
e
r
e
mot
e
ref
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
J
u
nio
C
H
amano
Merge br
a
nch 'jn/web'
commit
|
commitdiff
|
tree
2006-11-24
Junio C
Hamano
Merge branc
h
'pb/diff
r
oot'
commit
|
commitdiff
|
tree
2006-11-24
Juni
o
C
Hamano
M
e
r
g
e branch 'j
c
/pa
c
k-heuristics'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Merge
br
a
nch 'j
c
/numstat'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Merge
b
ranch 'ap/branch
-
ref-
d
isplay'
commit
|
commitdiff
|
tree
2006-11-24
Junio
C
Hamano
Merge branch
'
a
p/prune'
commit
|
commitdiff
|
tree
2006-11-24
J
u
nio
C
Hamano
T
y
pefix builtin
-
prune
.
c
:
:prune
_
object()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
P
eter Baumann
config option log
.
s
h
o
w
root to
show the diff of
r
oot
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
J
u
nio C
Ham
a
n
o
Merge branch
'jc/upload-pack'
commit
|
commitdiff
|
tree
2006-11-24
Eric Wong
git-svn: handle aut
h
entication witho
u
t
r
elying
on ca
c
hed
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Iñaki Arena
z
a
git-cv
s
im
p
ort: ad
d
support
f
or CVS
pserver met
h
od HTTP
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Petr Baud
i
s
Make g
i
t-c
l
one -
-
use-separate
-
remote
the default
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C
H
a
ma
n
o
r
e
f
s
outside ref
s
/{heads,tags} match
l
ess
s
t
rongly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Andy Pa
r
kins
I
ncrease l
e
ngt
h
of function nam
e
buffer
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
g
i
t-fetch: al
l
ow g
l
o
b
p
at
t
ern
in refspe
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Ha
m
ano
git-fe
t
ch: fix
d
umb pr
o
toco
l
t
r
ansport to fetch fr
o
m
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hama
n
o
git-fetch: reuse ls-remote result
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-23
Eric Wong
git-svn: pre
s
erve uncommitted
chang
e
s after d
c
ommit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next