repo.or.cz
/
tgit.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
Johannes Schindelin
Add built
i
n merge-
f
i
le, a minimal replacement for RCS
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-05
Joha
n
ne
s
S
c
hi
n
delin
x
d
l_merge()
:
fix
and simplify conflict handling
commit
|
commitdiff
|
tree
2006-12-03
Johannes Schindelin
xdl_merge
(
)
: fix thinko
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Johann
e
s Sc
h
i
ndelin
xd
l
_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
J
unio C Ha
m
ano
m
e
rge-recursive
:
use xdl
_
merge()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Ju
n
io C H
a
man
o
x
m
erge: m
a
ke return
va
l
ue fro
m
xdl_
m
erge
(
) more usable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Jo
h
a
nnes Sch
i
ndel
i
n
xdiff: a
d
d xdl_merge()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Ham
a
no
M
e
rge
branch
'maint'
commit
|
commitdiff
|
tree
2006-12-03
E
r
ic Wong
git-svn: avoid fetching
file
s
twice in the
s
ame revision
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
git-me
r
ge: fi
x
co
n
fusion between tag and branch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-02
An
d
y Parkins
De-emphasis
e
the
symbolic link documentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-02
Andreas Eric
s
s
on
git-d
i
ff: Introduce --index and deprecat
e
--cached
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-02
A
ndreas E
r
i
csson
ls-files: Gi
v
e hi
n
t
s when errors happen
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-30
Nicolas Pitre
pa
c
k-objects:
remove
r
e
du
n
dent s
t
atus info
r
m
a
tion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
J
u
nio C Ha
m
ano
Merge
master
.
ke
r
nel
.
or
g
:/pub/sc
m
/gitk/gitk
commit
|
commitdiff
|
tree
2006-11-29
Junio C H
a
mano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2006-11-29
A
n
dy Parkins
Document git-repo-config
--bool/--int
o
ptio
n
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Junio C Ha
m
ano
tutori
a
l:
t
a
l
k a
b
out u
s
er
.
name early and
don'
t
s
tart
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Alex Riesen
git
-
blame: fix rev paramete
r
handling
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
J
u
nio C Ha
m
ano
Merge bra
n
c
h 'jc/glo
b
fetch'
commit
|
commitdiff
|
tree
2006-11-29
J
unio
C
Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-11-29
Juni
o
C Hamano
git blame -C: fix output
f
ormat tweaks w
h
en crossing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Eric Wong
g
i
t
-s
v
n
: fix multi-ini
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Eric Wong
git
-
svn: do
c
umentation
upda
t
es
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Eric W
o
ng
g
i
t
-sv
n
:
color
s
upport for
t
he log command
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Han
-
Wen Nienhuys
id
e
nt
.
c: Tri
m
hin
t
print
e
d
when geco
s
is emp
t
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Shaw
n
O
.
P
e
arce
Fix broke
n
b
ash completion of local refs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Shawn O
.
P
e
arce
Te
a
c
h
bash how to complet
e
long options for git-commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wong
g
it-sv
n
: fi
x
outp
u
t repo
r
t
ing from t
h
e del
t
a fetcher
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Eric
Wong
git-svn:
e
rror out when the
SVN connection fails during
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
René Scharfe
shor
t
log: remove range check
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wong
git-s
v
n
:
update te
s
ts fo
r
recent changes
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
E
r
ic Won
g
git
-
svn
:
enab
l
e delta tr
a
nsfer
s
during fetc
h
e
s
when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
J
o
h
a
n
nes Schindelin
sha1_
o
bject_info(): be
consiste
n
t w
i
th rea
d
_
sha1_file()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Johannes Schindelin
shortlog: use pager
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
cvsimport: style fixup
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Eric Wong
git-
s
vn: use ~/
.
subversion co
n
fig files when using
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shaw
n
O
.
Pearce
Teach bash a
b
o
ut git-am/git-apply and the
i
r
wh
i
tespace
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Sh
a
wn O
.
P
e
ar
c
e
C
a
che t
h
e list of me
r
g
e
strategi
e
s a
n
d a
v
a
i
labl
e
commands
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
S
upport --str
a
tegy=x complet
i
on in addition to --strat
e
g
y
x
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn
O
.
Pearce
T
each bash about git-repo-config
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
S
haw
n
O
.
Pearce
Support b
a
sh com
p
let
i
o
n
o
f refs/remot
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teach bash ab
o
ut git log/show/whatcha
n
ged opti
o
ns
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
S
h
awn O
.
Pearce
Teach bash
how to complete g
i
t-r
e
b
ase
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
S
h
awn O
.
Pearce
T
e
ach bash how
to co
m
plete git-che
r
ry-pick
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn
O
.
Pe
a
rce
Teach bash how to complete
g
it-format-patch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shaw
n
O
.
Pearce
Add
c
ur
r
ent
branch
in PS1 s
u
pport to git-comp
l
etion
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pear
c
e
T
e
ach bash how to compl
e
te
options for git-name-rev
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
ear
c
e
Hide plumbin
g
/transport co
m
mands from bash com
p
letion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Te
a
ch git-com
p
l
et
i
on
.
bas
h
how t
o
c
o
mplete gi
t
-m
e
rge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
S
e
an
Upda
t
e
documentation to remove
incorrect GIT_DIFF_OPTS
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Junio
C
Hamano
Merge bran
c
h
'
js/shortl
o
g'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
Merge branc
h
'jc/push-delete
-
ref'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hama
n
o
Merge b
r
anch 'jc/merg
e
'
commit
|
commitdiff
|
tree
2006-11-27
Ju
n
io C
H
amano
git-
m
erge: do not l
e
ak
re
v
-par
s
e
o
u
tput us
e
d for check
i
n
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Ju
n
i
o
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
Hamano
Merg
e
b
r
an
c
h '
j
c
/p
a
ck-pee
l
e
d'
commit
|
commitdiff
|
tree
2006-11-26
J
u
ni
o
C Hamano
gr
e
p:
do not skip
unmerged
e
n
tr
i
e
s wh
e
n
gr
e
pping 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 given explicit
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 Fiel
d
s
Docum
e
ntation: clar
i
f
y
tutorial pull/merge discussion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-26
Jaku
b
Nar
e
bsk
i
gitweb:
Make
p
roject des
c
r
i
ption in projects list link
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-26
Eric Wong
git-svn:
a
llow SV
N
:: lib users to tr
a
ck the
r
oot of
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Jakub Nareb
s
ki
gitw
e
b: Use autho
r
_e
p
och for pubdate in
g
i
t
web feeds
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
J
aku
b
Na
r
ebski
gitweb: Add auth
o
r and co
n
tributor email to Atom feed
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
J
a
kub Narebski
gitweb:
Add author and commi
t
te
r
e
mail extraction to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Jak
u
b Nare
b
ski
gitweb: Use git
-
show-ref inst
e
ad of git
-
peek-remote
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Jak
u
b Na
r
ebski
gitweb
:
Do n
o
t use esc_
h
tml in esc_path
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio
C
Hamano
fe
t
ch-pack: do not bar
f
w
h
en duplicate
r
e patterns
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hama
n
o
gi
t
-
f
etch: allow forcin
g
glob pattern in r
e
f
s
pe
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hamano
Merge bran
c
h 'master'
i
nto jc/globfetch
commit
|
commitdiff
|
tree
2006-11-25
Ju
n
io C Ham
a
no
git-fetch: e
x
it with
n
on-z
e
ro status when fa
s
t-
f
orward
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Hama
n
o
git-shortlog: make common reposi
t
ory
pref
i
x configurable
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
J
u
n
io C Hama
n
o
git-shortlog:
f
ix common repository pr
e
fix
abbrevia
t
ion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Eric Wong
git
-
svn: exit wi
t
h
status
1
for t
e
st
f
ailures
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Eric Won
g
git-svn: correc
t
l
y
access re
p
os when only give
n
partial
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio C Ha
m
ano
git-branc
h
-D: ma
k
e it wo
r
k e
v
en
w
hen on a yet-to
-
be
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
L
a
r
s Hjemli
Add -
v
a
n
d
-
-abbrev
o
ptions to git-b
r
anch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-25
Junio
C Hamano
git-clone: stop dumb protocol fr
o
m copying
r
efs outside
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hama
n
o
gitweb:
(s
t
y
l
e) use c
h
omp without parenthe
s
e
s
consist
e
ntly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Jakub Narebski
gitweb: Replac
e
SPC
w
i
th
also i
n
t
ag
c
o
m
ment
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Al
l
ow g
i
t
push to delete remote ref
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
J
u
nio C Ha
m
a
no
Merge
b
ra
n
ch 'jn/w
e
b'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Merge
branch 'p
b
/diffroot'
commit
|
commitdiff
|
tree
2006-11-24
Jun
i
o C H
a
mano
M
e
rge branch '
j
c/p
a
c
k-heuristics'
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Me
r
ge bran
c
h
'jc/nu
m
stat'
commit
|
commitdiff
|
tree
2006-11-24
J
unio C H
a
m
a
no
Merg
e
b
ranch '
a
p
/
b
ran
c
h
-r
e
f-
d
isplay'
commit
|
commitdiff
|
tree
2006-11-24
J
unio C
H
aman
o
Me
r
ge
branch 'ap/prun
e
'
commit
|
commitdiff
|
tree
2006-11-24
Junio C
Hamano
T
y
pe
f
ix buil
t
in-pr
u
n
e
.
c::prun
e
_
o
b
j
ect()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Pe
t
er Baumann
c
onfig option log
.
sho
w
root to sh
o
w the diff of root
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
Merge b
r
anch 'jc/
u
p
l
oad-pack'
commit
|
commitdiff
|
tree
2006-11-24
E
r
ic
W
on
g
git
-
sv
n
: handl
e
a
u
thentication without relying on cached
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Iñaki Arenaza
git-cvsim
p
ort:
add support for CVS
pserver m
e
t
h
o
d
HTT
P
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Petr Baudis
Make
g
it-clone
-
-use-separate-remote
the defa
u
lt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Hamano
refs
o
utside r
e
fs
/
{heads
,
tags} m
a
tch less
s
trongly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
A
ndy Parkins
Increase
l
en
g
th of funct
i
on name
b
uffer
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio
C Hamano
git-fe
t
ch: allow glob
p
attern in refspe
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Junio C Ham
a
n
o
g
i
t-fetch: fi
x
dumb protocol transport to fetch f
r
om
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-24
Juni
o
C Ha
m
ano
git-fetch: reuse ls-re
m
o
t
e resul
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-23
Eri
c
Wong
git-svn: prese
r
v
e
unco
m
mitted chang
e
s afte
r
dcomm
i
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next