repo.or.cz
/
git
/
fastimport.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-file: support -p and -q; fix compile warnings
2006-12-06
Johanne
s
Schin
d
e
lin
merge
-
fil
e
: support -p and -
q
;
f
ix compile warni
n
gs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Johann
e
s Schindelin
Add builtin merge-fil
e
, a m
i
nimal repla
c
ement fo
r
RCS
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-05
Johannes Schindelin
xd
l
_merge(): fix and simplify conflict handling
commit
|
commitdiff
|
tree
2006-12-03
Johannes Schindelin
x
dl_merg
e
(): fix thin
k
o
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Johannes Schin
d
elin
xd
l
_merge(): f
i
x an off-by-one bug
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Ham
a
no
mer
g
e-
r
ecursive
:
use xdl_me
r
ge()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Ha
m
ano
xm
e
rge: make retu
r
n value from xdl
_
merge() more
usable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Jo
h
annes
S
chindelin
xdiff: add xdl_mer
g
e()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Ju
n
i
o C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2006-12-03
E
r
ic Wong
git-svn: avoid fetching fil
e
s twice in
t
he sam
e
revisio
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio
C
Ha
m
a
n
o
git-me
r
ge: fix co
n
fusio
n
between tag and branch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-02
A
ndy Parkins
De-
e
mphasis
e
t
h
e symbo
l
ic
l
ink
documentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-02
Andr
e
as Ericsson
git-di
f
f: Introduce
-
-
i
ndex and deprecate --cached
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-02
And
r
eas Eric
s
s
on
ls-
f
i
les:
G
ive hint
s
when e
r
ro
r
s happe
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-30
Nicolas P
i
tre
p
ac
k
-obj
e
cts: remove redu
n
dent
statu
s
information
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Junio C H
a
man
o
Merge master
.
k
e
r
n
el
.
org
:
/pub/scm/gitk/git
k
commit
|
commitdiff
|
tree
2006-11-29
J
u
n
io C Hamano
Mer
g
e branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2006-11-29
Andy Parkins
Document git-r
e
po-config --b
o
ol/
-
-int opti
o
ns
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Juni
o
C Hama
n
o
tu
t
o
r
i
al: t
a
lk about us
e
r
.
n
a
me early and don't
start
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Alex Riesen
git-blame: fix rev param
e
ter handling
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
M
erge branch 'jc/glo
b
fe
t
ch'
commit
|
commitdiff
|
tree
2006-11-29
J
u
nio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
git blam
e
-
C
:
f
i
x
output format tw
e
ak
s
when
c
r
ossin
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Eric Wong
git-svn:
f
ix multi-in
i
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Eric Wong
git-svn: documen
t
ation updates
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Eric Wong
git-svn:
color supp
o
rt for
t
he
log command
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Han-Wen Nienhuys
ide
n
t
.
c: Trim h
i
nt pr
i
nted w
h
en gecos
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 bash completion of loc
a
l refs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Sh
a
wn O
.
Pe
a
rce
Teach bash
how to comple
t
e long options 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
r
ep
o
rting from t
h
e delta f
e
tcher
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Eri
c
Wo
n
g
g
it-svn: error
out when the SV
N
connection fails during
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
R
e
n
é Sc
h
arfe
s
h
ortlog: r
e
move range check
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wo
n
g
git-svn: update tests
for re
c
ent cha
n
g
es
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Eric
W
ong
g
i
t-svn: enable
d
elta transfers dur
i
ng fetc
h
es
w
he
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Joh
a
nnes S
c
hin
d
el
i
n
sha1_ob
j
e
ct_info(): be
c
o
nsistent with read_sha1_file()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Johannes
S
chindel
i
n
sho
r
tlog: use
p
a
g
er
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Ju
n
io C Ham
a
no
cvsim
p
o
rt: styl
e
fixup
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Eric Wong
g
i
t
-
svn:
u
se ~/
.
subversion conf
i
g files wh
e
n using
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn
O
.
Pearce
Teac
h
b
ash about git-am/g
i
t-apply and their whitespac
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Sha
w
n
O
.
Pearce
Cach
e
t
he list of
merge strategies and available c
o
mmands
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
e
arce
Supp
o
rt --strategy=x completio
n
in
a
ddition to --strategy
x
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
S
hawn O
.
P
e
ar
c
e
T
e
ach bash about git-repo-co
n
fig
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearc
e
Support bash completion
of refs/remote
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
S
h
awn O
.
Pe
a
r
ce
Teac
h
bash abou
t
git
log/
s
how/whatch
a
n
g
e
d options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Sh
a
wn
O
.
Pearc
e
T
e
ach bash
how to complete git-rebase
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pe
a
rce
Te
a
ch bash how to comp
l
ete git-c
h
erry
-
pick
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teach bash how
to
c
omplet
e
g
it-format-patch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pe
a
rce
Ad
d
current branch
in PS
1
sup
p
ort to
git-comple
t
ion
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Sh
a
wn O
.
P
e
ar
c
e
Teach bash how to complete options for git-na
m
e-rev
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Hide plumbing
/
transpor
t
co
m
mands from bash
c
o
mpleti
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Sha
w
n O
.
Pearce
Teach g
i
t
-completion
.
bash how to compl
e
te git
-
m
erge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Sean
Update documentation to remove
i
nco
r
re
c
t
GIT
_
D
IFF_OPTS
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Junio C
H
aman
o
Merge branch 'js/shor
t
log'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hama
n
o
Merge bran
c
h 'jc
/
push-dele
t
e-r
e
f
'
commit
|
commitdiff
|
tree
2006-11-27
Junio C H
a
mano
Merge
b
r
a
nch 'jc/mer
g
e'
commit
|
commitdiff
|
tree
2006-11-27
J
unio C
H
a
mano
gi
t
-merge: d
o
n
o
t l
e
a
k
rev-
p
arse
ou
t
put
u
sed fo
r
ch
e
cking
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Junio C
H
am
a
no
git-mer
g
e: ti
g
hten error ch
e
cking
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Junio C
H
a
m
ano
Me
r
g
e
branc
h
'j
c
/pac
k
-peel
e
d
'
commit
|
commitdiff
|
tree
2006-11-26
J
unio C Hamano
grep: do no
t
skip un
m
erge
d
ent
r
ies when
g
repping in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-26
Han-Wen Nienhuys
git-tag: allow
empty tag message if -
m
is
g
i
v
e
n expli
c
i
tly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-26
Junio C Hamano
Merge
b
ranch 'jn/web'
commit
|
commitdiff
|
tree
2006-11-26
J
.
Bruce
F
i
e
lds
Docum
e
n
tation: clarify
tut
o
r
ia
l
pull/merge discussion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-26
Jakub Narebski
gitweb
:
Make p
r
oject d
e
scription in pro
j
ects li
s
t
l
ink
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-26
Eri
c
W
ong
git-svn:
a
l
l
o
w SVN:: lib users to track t
h
e ro
o
t
o
f
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Jakub Na
r
ebski
gitw
e
b: Use au
t
hor_epoch for pubd
a
te
i
n
g
itweb feeds
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
J
a
kub
N
ar
e
bski
gitweb: Add
a
utho
r
and contributo
r
emai
l
to
A
tom fe
e
d
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Jaku
b
Narebski
gi
t
web: Ad
d
au
t
hor and committer email extraction to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Jakub
N
arebsk
i
gitweb:
U
se g
i
t-
s
how-ref
i
nstead o
f
git-peek-remot
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Jakub Narebski
gitweb: Do not
use esc_
h
t
m
l in esc_pa
t
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
fetc
h
-pac
k
: do not barf when duplicate
r
e
p
atterns
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
J
u
n
io C Hamano
git-fetc
h
: allow forcing glob pattern in refspec
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hama
n
o
M
e
rge
branch 'master' in
t
o
jc/globfetch
commit
|
commitdiff
|
tree
2006-11-25
Juni
o
C Hamano
g
i
t-fetch: exit with non-zero sta
t
us when fast-forward
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Ju
n
io C Hamano
g
it-sh
o
rtl
o
g: m
a
ke
c
ommon repository pref
i
x configura
b
le
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio
C
Hamano
git-shortlog: fix common
r
ep
o
s
ito
r
y prefi
x
abbrevia
t
ion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Eric Wong
git
-
svn:
exit with sta
t
us 1 for test
f
ailures
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
E
r
ic Wong
git-svn: c
o
rrectly access r
e
po
s
when only given partial
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio C
Hamano
g
it-branch -D
:
make it work even when on a yet-to-be
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Lars
Hjem
l
i
Ad
d
-v and --abb
r
ev option
s
to g
i
t-branch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Ju
n
io
C
H
a
mano
git-clone
:
stop
d
umb protoc
o
l from copyin
g
refs outside
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
gitweb: (
s
ty
l
e) use chomp without
p
a
r
e
ntheses
con
s
istentl
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Jaku
b
Nareb
s
k
i
gi
t
w
eb: Rep
l
ace SPC wi
t
h &nb
s
p;
also
in tag comment
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
A
l
l
o
w git
push t
o
delete rem
o
te ref
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio
C H
a
m
a
no
Merge branch
'
jn/web'
commit
|
commitdiff
|
tree
2006-11-24
J
u
nio C
Hamano
Merge branch 'pb
/
diffro
o
t'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Merge b
r
an
c
h
'
jc/pac
k
-
h
eu
r
istics'
commit
|
commitdiff
|
tree
2006-11-24
J
u
nio
C
Hamano
Merge branch 'jc/numstat'
commit
|
commitdiff
|
tree
2006-11-24
Junio C
Hamano
Merge branch '
a
p/branch-
r
ef-display'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Merge
b
ra
n
ch 'ap/prune'
commit
|
commitdiff
|
tree
2006-11-24
J
u
nio C Hamano
Ty
p
efix buil
t
in-prune
.
c::
p
rune_
o
bject()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Peter Baumann
confi
g
option log
.
showroot
t
o show t
h
e
diff of
r
oot
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Juni
o
C Hamano
Me
r
ge branch
'
j
c/upload-pack'
commit
|
commitdiff
|
tree
2006-11-24
Eric
W
ong
git-sv
n
: handle
a
uthentic
a
tion
without
relyin
g
on cached
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Iñaki Arenaza
git-
c
v
s
import: add
supp
o
rt f
o
r CVS
p
server
method HTTP
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Petr Bau
d
is
M
ak
e
git-clone --u
s
e-separate-remote th
e
d
efa
u
lt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
refs outside refs/{heads,tags
}
match less str
o
ng
l
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
An
d
y Parkins
Incr
e
ase length
o
f
funct
i
on na
m
e buffer
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
git-f
e
tch: allow glob p
a
ttern in refspec
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
J
u
n
i
o
C
Haman
o
git-fetch: fix dumb
p
rotocol t
r
an
s
port to fetch from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio
C
Hamano
git-fetch: reuse ls-remote result
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next