repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch
2007-03-05
Santi Béjar
t
/
t5515-fetch
-
merge-logic
.
sh
:
Adde
d
tests for the merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-05
Ju
n
io C Hamano
Post 1
.
5
.
0
.
3 clea
n
up
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
Merge b
r
anc
h
'js/fetch-progress' (early part)
commit
|
commitdiff
|
tree
2007-03-05
Junio C
Hamano
M
e
rge bran
c
h 'js/
s
ymlink'
commit
|
commitdiff
|
tree
2007-03-05
Juni
o
C
Ha
m
a
no
Merge br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2007-03-05
J
u
nio
C
Hamano
GIT 1
.
5
.
0
.
3
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-05
Y
asush
i
SHOJI
g
lossary: Add definitions fo
r
da
n
gling and
u
nreachab
l
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-05
J
.
Bruce Fi
e
lds
user-manual: mo
r
e detailed merge
d
iscussion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-05
J
.
B
r
uce Fields
u
ser-manual: how to rep
l
ac
e
commits older tha
n
most
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-05
J
.
Bru
c
e Fie
l
ds
use
r
-man
u
al: insert
e
a
rlier of m
e
ntion cont
e
nt-ad
d
r
e
ssable
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-05
J
.
Bruce Fields
user-manual: ensure generat
e
d
m
anu
a
l refer
e
nces stylesh
e
et
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-05
J
.
Bruce
Fields
user-manual: reset to ORIG_HEAD
not HEAD to undo
m
erge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-05
J
.
Bruc
e
Fields
Docum
e
ntation: mention modul
e
option to git-cvs
i
mport
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
Eric Wong
git-s
v
n: f
i
x
show-ignore when not connected to the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
J
unio C Hamano
diff-
n
i
:
allow running fro
m
a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
Junio C
Hamano
M
erge branch 'js/diff
-
ni
'
(earl
y
part)
commit
|
commitdiff
|
tree
2007-03-04
Junio C Hama
n
o
Merge bra
n
ch
'maint
'
commit
|
commitdiff
|
tree
2007-03-04
Ramsay
J
o
nes
Unset
NO_C
9
9_FO
R
MAT on
Cygwi
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
J
oha
n
nes Sixt
Tell multi-parent dif
f
ab
o
ut core
.
sym
l
inks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
J
ohannes Sixt
H
andl
e
core
.
syml
i
n
ks=false case in merge-recur
s
ive
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
Ra
m
say Jones
Fix a
"
point
e
r t
y
pe missma
t
ch" warning
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
Ramsay
Jones
Fix some "comparis
o
n is a
l
ways true/f
a
lse" warning
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
Ramsay
J
ones
Fix an
"implici
t
function definition" warning
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
R
a
msay Jones
Fix
a
"lab
e
l defined but unreferenced
"
warn
i
ng
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
Johannes Schindelin
Document the config var
i
able format
.
suffix
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-03
J
u
nio
C Hama
n
o
gi
t
-
merge: fa
i
l correctl
y
w
h
en we can
n
ot fast forward
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-03
Johan
n
es Schind
e
lin
builti
n
-archive: us
e
RUN_S
E
TUP
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-03
Matthi
a
s K
e
ste
n
h
o
lz
Fix
g
it-gc u
s
age note
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-03
Johannes Sixt
Add core
.
symlinks to mark
filesy
s
tems
that do
not
su
p
port
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-03
J
unio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-03-03
Julian
Phillips
git-branch: document
n
ew --no-abbrev
opti
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-03
Julian P
h
illip
s
git-
b
ranch: impr
o
ve
a
bbreviati
o
n of s
h
a1
s
i
n
verbose
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-02
J
o
han
n
es Schindelin
print_wr
a
pped_text: fi
x
output for nega
t
iv
e
indent
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-02
Ger
r
it Pape
Fix
quoting in up
d
ate ho
o
k tem
p
l
a
t
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-02
And
y
Park
i
ns
Samp
l
e
u
pd
a
t
e hook: typ
o
fix and modernization to use
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-02
Jun
i
o C Hamano
Merge branch
'
js/commit-for
m
a
t'
commit
|
commitdiff
|
tree
2007-03-02
Ju
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-02
Eygene Ryab
i
nkin
A
nother m
e
mory o
v
erru
n
in http-push
.
c
commit
|
commitdiff
|
tree
2007-03-01
Jo
h
a
n
nes Schinde
l
in
fetch
.
o
d
e
pends on the
h
eaders
,
too
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-01
Chr
i
stian Schlotter
Docu
m
entat
i
on: Correct minor typo in
g
i
t-add docu
m
entation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-01
Sergey Vlasov
Docu
m
e
ntation/git-svn
.
txt: Fix formatting
e
rrors
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-01
Sergey Vlasov
Documentation/git
-
sen
d
-email
.
txt: Fix
l
abeled
list
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-01
Se
r
gey Vlasov
Document
a
tion/git-quiltimport
.
t
xt
:
Fix labeled list
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-01
Sergey Vlasov
Documentati
o
n/build-docdep
.
p
e
r
l
: Fix
d
ependencies for
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-01
Michael Coleman
fix
v
ari
o
u
s
doc
t
ypos
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-01
Johannes S
c
hindelin
diff: make more cases implicit
-
-no-ind
e
x
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Jun
i
o C Hamano
A
d
d
recent changes to draft 1
.
5
.
1
r
elease notes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merge branch '
j
s/comm
i
t-by-name'
commit
|
commitdiff
|
tree
2007-02-28
J
u
nio
C
Hamano
Merge
b
ranch 'js/bundle'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
M
erge bran
c
h 'ma
i
nt
'
commit
|
commitdiff
|
tree
2007-02-28
Ju
n
io C Hama
n
o
Start prep
a
ri
n
g Re
l
ea
s
e Note
s
for 1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
Junio C
Hama
n
o
Document
a
tion: g
i
t-remot
e
add
[
-t
<
branch>] [-m <bra
n
ch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Uwe Klei
n
e-Kön
i
g
I
nclude config
.
mak in doc/Makefile
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Alexandr
e
Julliar
d
git
.
el
:
Set
the default commit coding syst
e
m
from the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Paolo
Bo
n
zini
git-archimport: support e
m
pty su
m
maries, put s
u
mmary
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Eyge
n
e Ryabinkin
http-push
.
c::lock_remote():
validate all remote
r
efs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Ham
a
no
index_
f
d(): co
n
v
e
rt blob
only
i
f it
is a regular
f
ile
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
index_fd(): p
a
ss optio
n
al path paramet
e
r as hi
n
t for
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio C
H
a
mano
index
_
fd(): use enum o
b
ject_type instead of type name
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Ju
n
io C Haman
o
Mer
g
e
branc
h
'np/type
s
'
commit
|
commitdiff
|
tree
2007-02-28
G
errit Pape
git-cv
s
ex
p
ort
c
ommit
:
d
on't cleanup
.
msg if n
o
t ye
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Jun
i
o C Hamano
Merge b
r
anch 'mc/sendmail'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merge b
r
anch
'js/diff-ni' (e
a
r
ly
p
art)
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
M
e
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-02-28
Michael Colema
n
buil
t
in-fmt-merge-msg: f
i
x b
u
gs in --file
o
ption
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Shawn O
.
Pe
a
rce
index-pack: L
o
o
p
o
v
er pread un
t
il data
load
i
n
g is c
o
mplete
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Aneesh
K
umar
bl
a
m
ev
i
ew: Fi
x
the br
o
wse behavi
o
r
in blameview
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Shawn O
.
Pearce
Cleanup check_valid in commit-tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Ni
c
olas P
i
tre
make sure enu
m
ob
j
ect_ty
p
e is signed
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Mic
h
ael
C
ole
m
an
g
it-send-e
m
ail: abort/usag
e
on b
a
d o
p
tion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Michael
Coleman
Fix minor typos/grammar in user-
m
anual
.
txt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Michael Poole
Co
r
r
e
c
t
ordering in git-cvsimport's opt
i
on d
o
c
u
mentat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Johannes S
c
h
indelin
sho
w
_date(): rename the "relative" parameter
t
o
"m
o
de"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Johanne
s
Schindelin
Actuall
y
make print_wra
p
ped_te
x
t() useful
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Linus Torvalds
git
-
show
:
Reject native ref
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
An
d
y Par
k
ins
cvsse
r
v
e
r: Mak
e
a
l
ways
-
binary
m
o
de a config file
o
pt
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
Andy
Par
k
ins
cvss
e
rver: Remove trailing
"
\n"
f
r
o
m commithas
h
i
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
J
u
nio C
Hama
n
o
Make 'cvs ci
'
l
o
ckless in g
i
t-cvsserv
e
r by
usin
g
gi
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
Theodore Tso
Fix git-s
h
o
w
man page formatting
in
th
e
EXAMPLES section
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
N
i
co
l
as P
i
tre
get rid
o
f l
o
okup_object_typ
e
()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
Nicolas Pitre
convert object t
y
pe
h
andling from a
s
trin
g
to
a
n
u
mber
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
Ni
c
olas Pitre
formal
i
ze typena
m
e(), and add its reverse
ty
p
e_
f
ro
m
_str
i
ng()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
Nicol
a
s Pit
r
e
sha1_file
.
c: don't ignore an error condition in
sha1_
l
o
o
se
_
o
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
Nicolas Pitre
sha1
_
file
.
c: cleanup "offs
e
t" usage
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
Nicolas Pit
r
e
sha1_file
.
c: cleanup hdr usage
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
Junio
C
Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-02-27
J
u
nio C Hama
n
o
git-apply: do not fix w
h
itespaces on context l
i
nes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
Jim Meye
r
i
n
g
diff --cc: int
e
g
er overflo
w
given a 2GB-or-large
r
file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
Linus To
r
valds
mai
l
info: do not g
e
t conf
u
sed with logical
line
s
tha
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Johannes Schindelin
diff --no-inde
x
:
als
o
imitate
the exit
s
tatus of diff(1)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio
C
H
ama
n
o
M
e
r
ge branch '
m
aster'
i
n
t
o js/
d
iff-ni
commit
|
commitdiff
|
tree
2007-02-26
Junio
C Hamano
Docum
e
n
t
a
tion: link
i
n 1
.
5
.
0
.
2 material t
o
t
he top
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
An
e
esh K
u
mar K
.
V
Documen
t
a
tion: doc
u
ment remote
.
<name>
.
tagopt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Merge
b
r
anch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2007-02-26
Junio C Ham
a
no
GIT 1
.
5
.
0
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Pavel
R
os
k
in
git-
r
e
m
o
te: support remotes with a
dot
i
n
the name
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio
C
Haman
o
D
ocum
e
nt
a
tion: describe "-f
/
-
t
/
-m"
o
ptions to "git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Ham
a
no
dif
f
--cc: fix disp
l
ay
o
f symlink
conflicts duri
n
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io C Hamano
Merge b
r
anc
h
'
jc/
m
erge-symlink' into
maint
commit
|
commitdiff
|
tree
next