repo.or.cz
/
debian-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
xdl_merge(): fix and simplify conflict handling
2006-12-05
Joha
n
nes
Schindelin
xdl_mer
g
e(): fi
x
and s
i
mpli
f
y conflict hand
l
ing
commit
|
commitdiff
|
tree
2006-12-03
Joh
a
nnes S
c
hindelin
xdl_merge(): fix t
h
inko
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Johannes Schinde
l
in
x
dl_merge(): f
i
x a
n
off-by-one bug
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio
C
H
amano
merge-recursive:
use
xdl_mer
g
e()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Jun
i
o C Hamano
x
m
erge: m
a
ke ret
u
r
n
va
l
ue from xdl_me
r
ge() m
o
r
e
usable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
J
o
hannes S
c
hindelin
xdiff: add xdl_merge()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
J
unio C Ha
m
an
o
Me
r
ge branc
h
'maint'
commit
|
commitdiff
|
tree
2006-12-03
E
ric
W
o
ng
git-svn: avoid fetching files twice in the sam
e
revisi
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C H
a
m
a
no
g
i
t-merge: fi
x
confusion between tag and branch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-02
A
n
d
y
Parkins
De-emp
h
asise the
symboli
c
link
d
o
cumentat
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-02
A
ndreas
E
r
icsson
git-di
f
f: Introduce --index and deprecate
-
-ca
c
hed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-02
Andr
e
as Ericss
o
n
l
s
-
files: Give hi
n
ts whe
n
e
r
rors happen
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-30
N
i
colas Pitre
pack-objects
:
remove r
e
d
undent status in
f
orma
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio C
H
amano
Me
r
ge mas
t
er
.
kernel
.
org:/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
M
erge branc
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2006-11-29
Andy
Park
i
ns
Document git-repo
-
c
o
nfig --bool
/
--i
n
t options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
J
u
ni
o
C
H
amano
tutorial: talk about user
.
name early
and don't
star
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Alex Rie
s
en
git-b
l
ame: fix re
v
param
e
ter h
a
ndlin
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio C H
a
mano
Merge bran
c
h '
j
c/
g
lobf
e
tch'
commit
|
commitdiff
|
tree
2006-11-29
Junio
C
Ha
m
ano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2006-11-29
Junio C H
a
m
a
no
g
i
t blam
e
-C: fix
o
u
tput for
m
at tweaks when crossing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
E
r
ic Wo
n
g
git-svn: fix multi-in
i
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Eric Wong
git-svn: do
c
umentati
o
n updates
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Eric
Wong
git-svn: color
s
uppo
r
t
f
o
r t
h
e
lo
g
command
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Han-Wen Nienhuys
ident
.
c:
T
rim hint
p
rin
t
ed
w
hen
g
e
c
os is emp
t
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
S
h
a
wn O
.
Pea
r
c
e
Fix broken bash
c
ompletion of loca
l
r
efs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Shawn
O
.
P
e
a
rce
Teach
b
a
s
h how
t
o complete long option
s
for git-commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Eric Won
g
gi
t
-svn: fix output rep
o
rtin
g
from the delta f
e
tcher
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
E
r
i
c Wong
g
it-s
v
n
:
error out when the SVN connection fails during
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
René
S
ch
a
rfe
shor
t
log: remove range 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 cha
n
ges
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wong
gi
t
-svn: enable delta trans
f
e
r
s during f
e
tches
wh
e
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Johannes Schinde
l
in
s
ha1_ob
j
ect_
i
nf
o
():
be consistent with
read_
s
ha1_file()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
J
o
hannes Schindelin
shortlog:
use pager
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
J
u
nio
C
H
a
ma
n
o
cvsim
p
o
rt: styl
e
fixup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Eric Won
g
git-s
v
n
:
use ~/
.
s
u
b
version
c
onf
i
g file
s
w
h
en using
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
T
ea
c
h b
a
sh abou
t
gi
t
-am/gi
t
-apply an
d
thei
r
wh
i
tespace
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
S
h
awn O
.
Pearce
Ca
c
h
e
th
e
li
s
t
of merg
e
strategies
a
nd
a
vai
l
able co
m
ma
n
ds
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Suppo
r
t
--strategy
=
x completi
o
n in
addi
t
ion to --s
t
rategy
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sh
a
wn O
.
P
earce
T
ea
c
h bash about
g
i
t
-repo
-
config
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pea
r
ce
Support bash co
m
p
letion of refs/remote
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shaw
n
O
.
Pearce
Teach bas
h
about
g
it log/s
h
ow
/
whatchanged opti
o
ns
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teach bash how to
c
omplete git-r
e
b
ase
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
e
arce
Teach bash how
t
o
complete
gi
t
-c
h
erry-pick
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
S
h
awn O
.
Pea
r
ce
Te
a
c
h
bash how
to
c
ompl
e
te git-fo
r
mat-p
a
tch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Add
c
urrent branch in PS1 supp
o
rt to git
-
com
p
letion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sha
w
n O
.
Pe
a
rce
Teac
h
ba
s
h how to complete options for g
i
t
-
n
a
m
e
-r
e
v
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Hide plu
m
bing/transp
o
rt commands from bash completion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn
O
.
Pearce
T
e
ach
git-completion
.
bash how to com
p
lete g
i
t
-merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Se
a
n
Update do
c
umentation to remove incorrect GI
T
_D
I
FF_OPTS
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
Merge b
r
anch 'js/s
h
or
t
log
'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Haman
o
Merge branch '
j
c/push-dele
t
e-ref'
commit
|
commitdiff
|
tree
2006-11-27
Junio C
H
ama
n
o
Me
r
g
e
b
ranch
'jc/merge'
commit
|
commitdiff
|
tree
2006-11-27
Juni
o
C
H
amano
gi
t
-
m
e
r
ge: do
n
o
t leak re
v
-pars
e
output us
e
d for che
c
king
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
gi
t
-merge: tig
h
t
e
n
err
o
r checking
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Juni
o
C
H
amano
Merge b
r
anch 'jc/pack
-
p
e
eled
'
commit
|
commitdiff
|
tree
2006-11-26
Junio C
H
aman
o
grep: do no
t
skip unme
r
ged
e
ntries
when grepping in
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-26
Han-W
e
n Ni
e
nhu
y
s
git-tag: allow empty tag
message
i
f
-m is given e
x
plicit
l
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-26
Junio
C Hamano
Merge branch 'jn/web
'
commit
|
commitdiff
|
tree
2006-11-26
J
.
Bruce Fi
e
l
d
s
Documentation: clarify t
u
torial
pu
l
l/
m
erge discussion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-26
Jakub Narebs
k
i
git
w
e
b: Make p
r
oject d
e
s
cription in projects list l
i
nk
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-26
E
r
ic Wong
git-sv
n
: allo
w
SV
N
::
l
i
b users to track the root
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
J
a
k
u
b Nareb
s
ki
gitweb: Use author_epoch for p
u
bdat
e
in g
i
tweb feeds
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Jakub Na
r
e
b
ski
gitw
e
b: A
d
d
aut
h
or
and
c
ontr
i
butor
e
mail to At
o
m feed
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Jakub Nareb
s
ki
gitweb:
A
dd autho
r
and committer email extra
c
tio
n
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Jakub Narebski
gitwe
b
: Use git-show-ref instead
of
g
it-pe
e
k-remote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Jakub Na
r
ebski
gitweb:
D
o
n
ot use
e
sc_html in esc_
p
a
t
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Haman
o
fetch-pac
k
: do
not bar
f
whe
n
du
p
licate
re patterns
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
J
unio C
H
amano
git-fetch: allow
f
orcing glob pattern in
refspec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Juni
o
C Hamano
Merge bra
n
ch 'mas
t
er' into jc/gl
o
bfetch
commit
|
commitdiff
|
tree
2006-11-25
Jun
i
o C Haman
o
git-fe
t
ch: exit with non-
z
ero status whe
n
fast-forward
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
git-sho
r
tlog: mak
e
c
o
m
mo
n
r
e
pository prefix
conf
i
gurabl
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C
H
a
m
a
n
o
git-shortlog:
f
ix common reposit
o
ry
pr
e
f
i
x
abbreviati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
E
r
i
c
Wong
git-svn: ex
i
t with status 1 fo
r
test failur
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Eric Wong
git-s
v
n:
c
or
r
ectly acce
s
s repos when
o
nly g
i
ve
n
p
artial
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C H
a
man
o
g
it-
b
r
anch -D: make
i
t work ev
e
n when on a ye
t
-to-be
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
La
r
s Hjemli
Add
-
v and --abbre
v
option
s
to git-branc
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
git-clone: st
o
p dumb protocol from copying
r
efs
o
utside
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Juni
o
C Haman
o
gitwe
b
: (st
y
le) use c
h
omp
without parenthese
s
c
o
nsistent
l
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
J
a
kub Narebski
git
w
eb: Replace S
P
C
with &
n
b
s
p; also in ta
g
comment
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
J
u
nio
C H
a
mano
Allow git push to
delete re
m
o
te r
e
f
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Me
r
ge
b
ra
n
ch 'jn/web
'
commit
|
commitdiff
|
tree
2006-11-24
Juni
o
C Hamano
Merge b
r
anch 'pb/diffroot'
commit
|
commitdiff
|
tree
2006-11-24
Junio
C
H
a
m
a
no
Me
r
ge bran
c
h
'jc/pack
-
heuri
s
tics'
commit
|
commitdiff
|
tree
2006-11-24
Junio
C
H
amano
Merge br
a
nch 'jc/numsta
t
'
commit
|
commitdiff
|
tree
2006-11-24
Junio
C
H
amano
M
erge br
a
nch 'ap/bran
c
h-ref-dis
p
lay'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Merge branch '
a
p/prune'
commit
|
commitdiff
|
tree
2006-11-24
Jun
i
o C Hamano
Typefix
bu
i
l
t
i
n-pru
n
e
.
c::prune_object()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Pete
r
Baumann
c
o
nfig option log
.
showroot to show th
e
diff of root
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Ju
n
io C Hamano
Merge
b
ra
n
c
h
'jc
/
upload-pack'
commit
|
commitdiff
|
tree
2006-11-24
E
r
ic Wong
git-svn: h
a
ndle authentication with
o
ut relying on cached
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Iñaki A
r
enaza
g
i
t-cvs
i
mpo
r
t: add support for CVS pser
v
er me
t
h
od HTTP
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Petr Baudis
Make git-clo
n
e --use-separate-
r
e
m
ote the d
e
faul
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Jun
i
o C Hamano
re
f
s o
u
tside
refs/{heads,t
a
gs} match
less strongly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Andy Parki
n
s
Increase le
n
gth of functio
n
nam
e
buffer
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
J
u
n
i
o C Hamano
g
i
t-fe
t
ch: all
o
w g
l
ob pa
t
tern in refspec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Ju
n
io C Hamano
git
-
fetch: fix
dumb protocol tr
a
n
s
port to fetch from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
g
i
t-fetc
h
: reus
e
ls-
r
emote result
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-23
Eric Wong
git-s
v
n: preserve uncomm
i
tted ch
a
n
g
es after dcom
m
it
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-23
Eric Wong
gi
t
-svn:
c
o
r
r
ectly handle revision 0
in SVN
r
eposit
o
rie
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next