repo.or.cz
/
git.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
Joha
n
nes S
c
h
i
nd
e
lin
A
dd buil
t
in merge
-
file,
a m
i
nimal replacemen
t
for RCS
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-05
Jo
h
ann
e
s
Schindelin
xdl
_
merge(): fix
and simpl
i
fy c
o
n
f
lict handling
commit
|
commitdiff
|
tree
2006-12-03
Johan
n
e
s
Schindelin
xdl_merge(): fix t
h
inko
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Jo
h
annes Schindelin
xdl_m
e
r
g
e(): fix an of
f
-b
y
-
o
ne bug
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hama
n
o
mer
g
e-recursive: use xdl_merge()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
J
unio
C
H
a
mano
xmerge: mak
e
return value from xdl_mer
g
e
(
)
m
or
e
usable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
J
ohannes Sc
h
indelin
xdiff: add xd
l
_mer
g
e()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio C H
a
m
a
n
o
M
e
rg
e
branch 'maint'
commit
|
commitdiff
|
tree
2006-12-03
Eri
c
Wong
git-svn: a
v
oid fetching files
t
wice in
the sam
e
rev
i
s
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
git-merge: fix confus
i
on betwe
e
n tag and bra
n
ch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-02
An
d
y Par
k
in
s
De-emphasise the sy
m
b
olic
link documentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-02
Andreas E
r
icsso
n
git-diff: Intr
o
d
uce --ind
e
x and deprec
a
te --cached
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-02
An
d
reas Er
i
csson
ls-files: G
i
ve hint
s
when errors
happen
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-30
Nicolas Pit
r
e
pack-objects: remove redundent status information
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Ju
n
i
o
C Haman
o
Merge
m
aster
.
kernel
.
o
r
g:/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2006-11-29
Junio C
H
ama
n
o
Mer
g
e branch
'maint'
commit
|
commitdiff
|
tree
2006-11-29
An
d
y Parkins
Document git
-
rep
o
-
c
onfig -
-
b
o
ol/--int options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
J
u
nio C Hamano
tutorial: talk ab
o
ut user
.
n
ame early and don't s
t
art
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
A
lex Ri
e
se
n
git-b
l
ame: fix r
e
v para
m
e
ter h
a
ndling
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Junio C
Ha
m
ano
Merge branch 'jc/glob
f
etch'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
Merg
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Ham
a
no
git blame -C: fix
o
utput format twea
k
s
when crossing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Eric Wong
git-svn
:
fix multi-init
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Eric
Wong
git-svn: d
o
cumentation u
p
d
a
tes
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Eric
W
ong
git-svn: color
s
upport
for the log com
m
and
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Ha
n
-Wen Nienhuys
ident
.
c: Trim hint printed whe
n
gec
o
s i
s
e
m
pty
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Shawn O
.
Pe
a
r
c
e
Fix broken bash completion of l
o
cal refs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
S
h
a
wn O
.
Pe
a
rce
Teach bash
h
ow to
complete long o
p
tions for git-commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
E
r
ic Wong
git-svn:
f
ix output r
e
porting from the
delta fet
c
her
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Eric Won
g
g
it-svn: err
o
r out w
h
en the SVN connectio
n
fails
during
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
René
S
c
h
a
rfe
shor
t
log: remove ra
n
ge check
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wong
git-svn: updat
e
tests for recent ch
a
nges
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wong
git-svn: enable delta tra
n
sfer
s
d
u
ring
f
etches
w
h
e
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
J
o
h
a
nn
e
s
S
chindeli
n
sha1_obj
e
ct_i
n
fo(): be c
o
nsistent
w
i
th read_
s
ha1_fil
e
()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
J
o
hannes
S
chindelin
shortlog
:
use
p
a
g
er
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
J
unio
C
Ham
a
no
cvsimport:
style fixup
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
E
ric
W
ong
git
-
svn: use ~/
.
subversio
n
config files
w
hen usi
n
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teach bash
a
bout gi
t
-
a
m/git-apply and
th
e
i
r
whitespace
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shaw
n
O
.
Pear
c
e
Cache the
l
ist
o
f merge s
t
rateg
i
e
s
and avai
l
ab
l
e c
o
m
mands
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
S
hawn O
.
Pearce
Support --strategy=x
c
omple
t
ion in addition to --strategy x
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pear
c
e
Te
a
c
h
bash abou
t
gi
t
-repo-confi
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
e
arce
S
uppor
t
b
a
s
h
completion of refs/r
e
mote
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn
O
.
Pearce
Teach bas
h
about git log/show/
w
hatchanged options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
S
hawn O
.
Pearc
e
Teach bash
h
ow to complete git-reba
s
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn
O
.
Pearce
Te
a
ch
b
ash how
to complete git-c
h
erry-p
i
ck
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
S
h
aw
n
O
.
P
earce
T
e
ach
b
ash how to complete
git-for
m
at-patch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
S
h
a
wn
O
.
Pea
r
c
e
Ad
d
current
branch i
n
P
S1 suppo
r
t
to
git
-
completion
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Sha
w
n
O
.
Pearc
e
T
e
ach bash
how to
c
o
mplete option
s
for
gi
t
-name
-
rev
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearc
e
Hide plumbing/t
r
a
n
spor
t
com
m
ands fro
m
bas
h
comple
t
ion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
S
hawn O
.
P
e
arce
T
each git-c
o
mp
l
etion
.
b
ash how to c
o
mplet
e
g
it-me
r
ge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Sean
Update documentation to
r
em
o
ve
inc
o
r
r
e
ct
G
IT_DI
F
F_OPTS
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Jun
i
o
C
H
amano
Me
r
ge branch 'js/short
l
og'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
M
e
rge
b
ranch
'jc/push-delete-re
f
'
commit
|
commitdiff
|
tree
2006-11-27
J
unio C Ha
m
ano
Mer
g
e branch '
j
c/me
r
ge'
commit
|
commitdiff
|
tree
2006-11-27
Juni
o
C Hamano
git-merge: do
n
ot leak rev-parse
o
utput use
d
for
c
h
e
cking
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
J
u
nio C Hamano
git
-
me
r
ge: tighten error
checking
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Junio
C Ha
m
ano
Merge branch '
j
c/pack
-
peeled'
commit
|
commitdiff
|
tree
2006-11-26
Junio C H
a
mano
grep:
do not skip unme
r
g
e
d entr
i
e
s
when grepping in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-26
Han-We
n
Nie
n
huys
g
i
t-tag: a
l
low
e
mpty ta
g
message if -m is give
n
e
xplic
i
tly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-26
Junio C
H
amano
Merge bran
c
h 'j
n
/web'
commit
|
commitdiff
|
tree
2006-11-26
J
.
Bruce Fi
e
lds
Documentation: c
l
arify t
u
t
orial pull/merge discussion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-26
J
akub Narebski
gitweb: Make pro
j
ect de
s
cription in project
s
li
s
t link
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-26
Eric Wong
git-svn:
allow SVN:: lib users to
t
r
a
ck
t
he r
o
ot of
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Jak
u
b Narebsk
i
gitweb: Use aut
h
or_ep
o
ch
for
pubdate in gi
t
web
f
eeds
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Ja
k
ub
N
a
r
eb
s
ki
gitweb: Add author
a
nd c
o
n
t
ributor email to Atom fe
e
d
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
J
akub Nare
b
s
ki
g
itweb: Add au
t
hor and committer email
e
xtraction to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
J
akub Na
r
e
bski
gitweb: Use
gi
t
-sho
w
-ref i
n
stead of
g
it-p
e
ek-remote
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Jaku
b
Narebski
gitweb: Do not use esc_html in es
c
_
p
ath
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio
C
Ham
a
no
fetch-pack:
d
o not b
a
rf wh
e
n
du
p
licate r
e
pat
t
erns
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio
C Ha
m
ano
g
it-fetch: allow fo
r
cing glob patt
e
rn in r
e
fspec
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
Merge
b
r
a
nch
'master' into jc/globfe
t
ch
commit
|
commitdiff
|
tree
2006-11-25
J
u
nio C Hamano
git-fetch: e
x
i
t
wi
t
h non-zero status whe
n
fas
t
-forward
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio C
H
am
a
no
g
it
-
sh
o
rtlog:
m
ake common reposi
t
ory
prefix configurable
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
git-shor
t
l
o
g: fix common
repositor
y
pref
i
x abbreviati
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Eric Wong
g
i
t
-svn: exit w
i
th
s
tatus 1
for
t
est fai
l
u
r
e
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Eric Wo
n
g
gi
t
-svn: correctly ac
c
ess repos
when only g
i
ven partial
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
J
u
nio C Hamano
git-branch
-
D
: make it w
o
rk even when on a yet-t
o
-b
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Lar
s
Hjemli
Add -v and --abbrev opti
o
n
s
to git-branch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio
C
Hamano
git-clone: stop dumb
p
rotocol from copying refs outs
i
d
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
gitweb: (s
t
yle
)
use
c
h
omp without
p
arentheses con
s
istently
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Jaku
b
Narebski
gitweb
:
Replace SPC w
i
th
a
lso
i
n t
a
g
c
omment
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Ju
n
io C Hamano
All
o
w git push to
delete
r
emote
r
ef
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
J
u
nio C
Haman
o
Merge branch 'jn/w
e
b'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Ham
a
no
Merge branch 'p
b
/
d
iffroot'
commit
|
commitdiff
|
tree
2006-11-24
Junio C H
a
m
a
no
Me
r
ge branch
'
jc/pack-heuristi
c
s'
commit
|
commitdiff
|
tree
2006-11-24
Junio C
H
a
m
ano
Me
r
ge
bra
n
c
h
'j
c
/numsta
t
'
commit
|
commitdiff
|
tree
2006-11-24
Junio C
Hamano
Merge branch 'a
p
/
b
ranch-
r
ef-display'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Merge bran
c
h
'ap/prune'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Typef
i
x builtin-
p
run
e
.
c:
:
prune_object()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Pe
t
er Ba
u
mann
con
f
i
g
o
p
tio
n
l
og
.
sh
o
wro
o
t to
s
h
ow
the
diff of root
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Merge branc
h
'jc/upload-
p
ack
'
commit
|
commitdiff
|
tree
2006-11-24
E
ric Wong
git-svn:
handle auth
e
nticatio
n
with
o
ut r
e
ly
i
ng on c
a
che
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Iñ
a
k
i Arenaza
g
it-cvsi
m
port:
add support fo
r
CVS pserver met
h
od HTTP
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Petr Baudis
Make gi
t
-clone --us
e
-separate-rem
o
te the default
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Ju
n
i
o C Hamano
refs ou
t
side refs/{heads,tags}
m
atch less str
o
ngly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
A
n
dy Parkins
Increase length of fu
n
ction
name buff
e
r
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Ham
a
n
o
git-fetch: allow g
l
ob patt
e
rn in refspec
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio C
H
amano
git-fetch: fix du
m
b protocol transport to fet
c
h from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
git-
f
etch: reuse ls-remote result
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-23
E
ric Wong
git-svn:
p
res
e
rve uncom
m
itted ch
a
nges af
t
e
r
dcommi
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next