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
Counto-fix in merge-recursive
2007-04-19
Junio C Hamano
C
o
unto-fix in merg
e
-
r
ecursive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fi
x
funny
t
ypes used in attribut
e
value
representa
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hamano
Allo
w
l
ow-level driver to spe
c
i
fy dif
f
erent b
e
h
avi
o
ur
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Custom low-level merge dri
v
er: ch
a
n
ge the
conf
i
guration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Allow
t
he de
f
au
l
t
l
ow-level
m
erg
e
driver to be conf
i
g
ured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom l
o
w-level merge driver support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
A
dd a de
m
onstration/test of customize
d
me
r
ge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
ama
n
o
Allow spe
c
ifyin
g
specialized merge-backend
per path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Hamano
merge-recurs
i
ve:
separate out xdl_merge() i
n
terface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allow more than true/
f
alse to at
t
ributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
ames B
o
wes
Doc
u
ment git-ch
e
c
k
-attr
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hama
n
o
Change
attribute negation marker
fro
m
'!' to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
mano
Define a
built-in attr
i
bute m
a
c
r
o
"
binar
y
"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C H
a
mano
attr
i
bute macro support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C H
a
mano
Makefile: add
p
at
c
h-ids
.
h back i
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'diff' attrib
u
te semant
i
c
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Ham
a
no
F
ix 'crlf' att
r
ibute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Hamano
Tea
c
h
'
diff' a
b
out 'diff' attrib
u
t
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
u
ni
o
C Ham
a
no
Define 'cr
l
f' attr
i
bute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ha
m
ano
Ad
d
basic i
n
frastructure to ass
i
gn attributes to paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Linus
Torval
d
s
git-quiltimport co
m
plaining
y
et still
worki
n
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
F
r
ank Lich
t
enheld
con
f
i
g
.
txt: Fix gr
a
mmatic
a
l erro
r
in description
o
f
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Fra
n
k Lichtenheld
config
.
tx
t
: Chang
e
pserver
t
o server in descri
p
tion
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Frank L
i
c
h
t
enhe
l
d
conf
i
g
.
txt:
D
o
cument core
.
a
u
t
ocrlf
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Fr
a
nk Lichtenheld
co
n
f
i
g
.
txt:
D
o
cument gitcvs
.
allbinary
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
D
o
n
ot def
a
ult to --n
o
-in
d
ex when given two dir
e
ct
o
ries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Alex Riesen
Us
e
rev-list --reve
r
se in git-rebase
.
sh
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
io C Ha
m
ano
Me
r
g
e
b
r
anch
'jc
/
cherry
'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
Ha
m
ano
M
erge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-13
M
at
t
hias Lederhofer
h
and
l
e_opt
i
ons in g
i
t wrapper miscounts the op
t
i
ons
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Fix
g
it {
l
og,sh
o
w
,
.
.
.
}
-
-pr
e
tty=e
m
a
il
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
S
hawn O
.
Pearce
D
on't
yap about
merge-subtree dur
i
n
g make
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C
Hamano
Document
a
ti
o
n: --c
h
erry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
n
io C Ham
a
no
git-log --cherry-p
i
ck A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Refact
o
r
pa
t
c
h-id filtering out of git
-
cherry and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C Hama
n
o
Add %
m
to '--pretty=format:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jim
M
eyering
ss
c
anf/strtoul: parse int
e
ge
r
s robustly
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Robin H
.
John
s
o
n
Add testcase
for form
a
t-patch --subject-pref
i
x (take 3)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Robin H
.
Johnson
Add cu
s
t
o
m su
b
ject
pref
i
x support to for
m
at-patc
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio C
Hamano
GIT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Frank
L
ic
h
tenhel
d
c
v
sserver: Fix handling of diappe
a
red files o
n
update
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Ju
n
io C
Hamano
fsck: do no
t
compla
i
n on detache
d
H
EAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Jim Meyering
(encode_85
,
d
e
c
ode_85): Mar
k
source buffer pointer
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
F
r
a
n
k
Li
c
htenheld
gitweb: Allo
w
configur
i
n
g the defa
u
lt project
s
order
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Frank Lichtenheld
gitweb
:
Allow fork
s
w
ith pro
j
ec
t
list file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C Ham
a
no
Merge bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-10
Julian Phillips
Documentation: show-ref:
d
ocu
m
ent --exclud
e
-
e
xisting
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Tomash Brechko
cvsex
p
ort
c
omm
i
t -p
: fix the usage of git-apply -C
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
René Sch
a
rfe
git-arch
i
v
e
: mak
e
t
a
r
the default format
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch
'
jc
/
push'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Ham
a
n
o
Merge branch 'jc/merge-subtr
e
e
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Hamano
M
erge bran
c
h 'js/f
e
tch-pr
o
gress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
am
a
no
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
ama
n
o
A
d
d
D
o
cumenta
t
ion/cmd-list
.
made to
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wong
git-svn
:
fix log
c
o
mmand to
avoid infini
t
e loop
o
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wong
git-svn
:
dcommit/rebase confused by patches
w
ith g
i
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wong
git-svn: bail out on incorr
e
ct
comma
n
d
-
line op
t
i
ons
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
Hamano
Star
t
1
.
5
.
2
cycle by pr
e
pareing RelNotes for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
Hamano
Merge branch 'jc/read-t
r
ee-
d
f' (early pa
r
t)
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-08
Junio C H
a
mano
Pr
e
pare f
o
r 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Frank Lichtenheld
cvsserve
r
: small
correctio
n
s to a
s
ciidoc documentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C Hamano
A new merge stra
g
e
t
y
'subtre
e
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
g
it-
p
ush to multiple lo
c
atio
n
s
doe
s
no
t
stop at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
g
it-push re
p
orts the URL after failing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
ma
n
o
M
erge br
a
n
c
h
'jc/index-output'
commit
|
commitdiff
|
tree
2007-04-07
J
un
i
o C Hamano
Merg
e
branch 'fp/ma
k
e-
j
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
Merge branch 'cc/
b
i
s
ect'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Ha
m
an
o
Merge branch
'
jc/checkou
t
' (ear
l
y
p
art)
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C
Hamano
Merge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C H
a
ma
n
o
Docume
n
tation: tighten dependenc
y
f
o
r
git
.
{
h
t
ml,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arj
e
n
Laarhoven
Makefile: iconv() on
Darwin has the old interface
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arj
e
n Laarhoven
t5300-p
a
ck-object
.
sh: portability i
s
sue using /usr
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Haman
o
git-bisect: allow b
i
secting with
onl
y
one bad commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
t6
0
3
0: add
a
b
i
t more tests to git-
b
isect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarhoven
t3200-
b
ranch
.
sh: small language nit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
A
rje
n
Laarhoven
u
s
e
r
manual
.
t
xt: some capi
t
alization nits
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Lars Hjemli
M
a
k
e builtin-
b
r
a
nch
.
c handle the git confi
g
file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Lars Hjemli
rename_ref(
)
: only p
r
int a warning wh
e
n config-file
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
B
r
ia
n
Gernhardt
Distinguish branche
s
b
y more than
case in tests
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
YOSHIFUJI Hide
a
ki
.
.
.
A
vo
i
d composing too
long "R
e
fer
e
nces"
heade
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
F
rank Licht
e
nheld
cvs
i
mport: Improve fo
r
mating co
n
si
s
tency
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenheld
cvs
i
mport: Reorder optio
n
s
i
n docum
e
n
tation for better
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Fra
n
k
Li
c
htenheld
cv
s
import: Improve usage error re
p
or
t
ing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
F
rank Lichtenheld
cvsim
p
ort:
I
mpr
o
ve document
a
ti
o
n of
C
V
S
ROO
T
and
C
VS
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Fr
a
nk Lichtenh
e
ld
cv
s
i
mport: sync usage
l
in
e
s with existing option
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hamano
git-bisect: mode
r
nizat
i
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Merge bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2007-04-05
Dana How
Fix
lseek
(
2
)
c
alls wit
h
args 2 an
d
3 swapp
e
d
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Fernando J
.
Pereda
Makefile: Add '+' to QUIET_SUBDIR0 to fix para
l
lel
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Chr
i
stian
C
ou
d
er
Docu
m
e
n
t
ation: bis
e
ct: "sta
r
t" accepts on
e
bad and
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
C
h
r
i
s
tian Couder
Bi
s
ect: teach
"bis
e
ct s
t
art" to op
t
ionally us
e
one
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Alex Riesen
Fix pas
s
ing of TCLTK_P
A
TH
t
o
git-gui
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
unio C
H
amano
Rena
m
e a
d
d_file_to_ind
e
x() to add_fil
e
_to
_
cache()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rena
m
e stat
i
c var
i
able
w
r
ite_ind
e
x to upda
t
e_index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rena
m
e internal func
t
ion "add_fi
l
e_to_cache" in builtin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
unio C Hamano
Propagate cache error int
e
rnal to
r
efresh_c
a
che() via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io
C
Hamano
Fix bogus error message f
r
om merge-recursive error
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next