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
Custom low-level merge driver: change the configuration scheme.
2007-04-18
Junio C Hamano
Custom low-
l
evel m
e
r
ge driver: change the
c
onfigurati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow
t
he default low-level merge
dri
v
er to
b
e
c
onfigured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
C
u
stom low-level
m
erge dr
i
ver support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Hamano
Add a d
e
monstrati
o
n/test of customi
z
ed merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Hamano
Allow specif
y
ing
s
pecialized merge-back
e
nd per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
no
merge-
r
ecursive: se
p
arate out xdl_
m
erge() interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Hamano
Allo
w
m
ore than true
/
fa
l
se to a
t
tr
i
butes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
a
mes B
o
w
e
s
Do
c
u
m
ent git-check-attr
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Change attribute n
e
ga
t
ion
marker from '!' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C
Ham
a
no
D
e
fine a built-in attribute ma
c
ro "b
i
n
ary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
attri
b
ute m
a
cro support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Ma
k
efile: add
p
a
tch-ids
.
h back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
n
io
C
Ha
m
ano
F
i
x 'dif
f
'
a
ttribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C
H
a
mano
F
ix '
c
rlf'
a
ttr
i
bute
s
ema
n
tics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hama
n
o
Teach 'd
i
f
f' about 'diff' att
r
i
b
ute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
a
m
a
no
Define 'crlf' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Add basic infra
s
tructure to
a
s
sign attribu
t
es to path
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Linus Torvald
s
g
i
t-quiltimp
o
rt complaining
ye
t
s
t
i
ll w
o
rking
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Frank L
i
chtenheld
config
.
txt
:
Fix grammatical error in
d
escripti
o
n o
f
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
F
rank
L
ichtenhe
l
d
config
.
txt:
C
hange
p
server to ser
v
e
r
in descript
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
F
rank Lichtenhe
l
d
config
.
txt: Documen
t
core
.
autocrlf
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Frank Lichtenhel
d
c
o
nfig
.
txt: D
o
cument gi
t
c
v
s
.
allbinary
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Ham
a
n
o
Do not
default
t
o --no-index when given two
d
irec
t
o
ries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
A
l
ex
R
iesen
Use rev-l
i
st --reverse in git-rebase
.
sh
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C Ham
a
n
o
M
e
r
ge bran
c
h '
j
c/
c
herry'
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
io C Haman
o
M
e
r
g
e
branch
'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-13
Matt
h
ias Lederhofer
handle_options in
git wrapper
mi
s
counts th
e
opt
i
ons
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C
Hamano
F
ix git {log,show,
.
.
.
} --pretty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Shawn O
.
Pe
a
rce
Don't
y
ap about merg
e
-subtree during make
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Docu
m
entation:
--che
r
ry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ham
a
no
git-log
-
-cherry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
mano
Refactor patch-id filtering out of git-cherry and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C
Hamano
Ad
d
%m
t
o '--pretty=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jim
Meye
r
in
g
sscanf/s
t
rtoul: parse integers r
o
bustly
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Robin
H
.
Johnson
Add
t
estc
a
se for
f
ormat-patch --s
u
bjec
t
-p
r
efix (take 3)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Robin H
.
J
ohns
o
n
Add custom
s
ubje
c
t p
r
efix su
p
port to format-pat
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
am
a
n
o
Merg
e
branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
i
o
C Hama
n
o
GIT
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Frank Lich
t
e
n
held
cvsserver: Fix handling of di
a
ppeared files o
n
u
p
d
ate
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
J
un
i
o C Hamano
fs
c
k: do not
c
o
mplain on detached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Jim Meyering
(
e
nc
o
de
_
85, decod
e
_85): Mark s
o
urce buffer
p
oint
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Frank
Lich
t
enh
e
l
d
gitw
e
b
:
Allow conf
i
gur
i
ng t
h
e
d
efault projects order
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Fr
a
n
k Lic
h
tenheld
gitweb: Allow forks with project
l
is
t
f
i
le
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Merge branc
h
'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-10
J
uli
a
n Phillips
Docume
n
tatio
n
: show-ref: docu
m
ent --
e
xcl
u
de-e
x
isting
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
To
m
a
sh
B
rechko
c
v
s
e
xportcommit -p
: fix
t
he usage of git-appl
y
-C
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ren
é
Scharfe
git-a
r
chive: make tar the default format
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge b
r
an
c
h 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
amano
Merge
br
a
n
ch 'jc/me
r
ge-subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C
Hamano
Mer
g
e b
r
an
c
h
'js
/
fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merg
e
bran
c
h
'
maint
'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio
C
Hama
n
o
Add Docume
n
tat
i
on
/
c
m
d
-list
.
made to
.
gitig
n
ore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Er
i
c Wong
git-s
v
n:
f
ix
log
com
m
and to avo
i
d infi
n
ite loop on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wong
git-sv
n
: dcomm
i
t/
r
ebase confused by patch
e
s with git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
E
r
i
c
Wong
gi
t
-svn: bail out on incorre
c
t
command
-
line options
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Hamano
S
t
a
rt
1
.
5
.
2
cycle by p
r
epareing
R
e
lNotes for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
unio C Hamano
M
erge branch '
j
c/re
a
d-tree-d
f
' (early part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
P
r
e
p
are for
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
F
r
ank
Lich
t
enheld
cv
s
server:
s
mall correcti
o
n
s
to
a
sciidoc
d
ocumentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A
n
ew merge st
r
agety 's
u
btree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hamano
git
-
push to multiple locations does not stop
at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hama
n
o
git
-
push reports the URL
after failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge bra
n
ch 'jc/index-output'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
Mer
g
e branch
'fp
/
mak
e
-j'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C H
a
m
ano
Merge bran
c
h
'cc/bi
s
ect'
commit
|
commitdiff
|
tree
2007-04-07
J
u
ni
o
C
H
amano
Merge branch 'j
c
/checkout' (early pa
r
t)
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
Do
c
ument
a
tion: t
i
g
hten de
p
e
ndenc
y
for git
.
{html,
t
x
t}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarhoven
Makefi
l
e:
i
conv() on D
a
rwin has the
old i
n
terface
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarhoven
t5300-
p
ac
k
-ob
j
ect
.
sh:
por
t
a
bility issu
e
using /usr
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
gi
t
-bisect: allow bisec
t
ing with only o
n
e
bad commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
t6030: add a
b
it more tests
t
o git-bis
e
ct
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
A
r
jen Laar
h
ov
e
n
t3200-branc
h
.
sh: small language nit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Arje
n
Laarhov
e
n
usermanual
.
txt: s
o
me ca
p
italizatio
n
nits
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Lars Hjemli
Make builtin-branch
.
c handle th
e
git
con
f
ig file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Lars H
j
emli
rename
_
re
f
(): onl
y
print a
w
a
rni
n
g when confi
g
-file
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Brian Gernhardt
Di
s
tinguis
h
branches
b
y
more than case i
n
t
e
sts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
YOSHIF
U
JI H
i
de
a
ki
.
.
.
Avoid com
p
os
i
ng too l
o
ng "
R
e
f
er
e
n
ces" he
a
der
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank Licht
e
nheld
c
vsimport
:
Improve formating consi
s
t
e
ncy
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank Li
c
htenhe
l
d
cvsimport: Reo
r
der options in documentation
for better
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank Licht
e
nheld
cvs
i
mport:
Improve u
s
age error rep
o
rting
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
F
ran
k
Lic
h
tenheld
c
v
simport: Improve documenta
t
ion
of
CVS
R
OOT and CVS
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Fra
n
k Lich
t
enheld
cvsimport: sync usage lines
with ex
i
st
i
ng opti
o
ns
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio
C
H
a
mano
git-bisect: modernization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Hama
n
o
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Da
n
a
How
Fix lseek
(
2) c
a
lls wit
h
args 2 an
d
3 swapped
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
F
e
rnand
o
J
.
Pereda
Makefile: Add '+' to
QU
I
E
T_SUB
D
IR0 to fix parallel
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Christia
n
Co
u
der
D
ocumenta
t
ion: bisect: "st
a
rt"
a
ccepts
o
ne ba
d
and
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Christi
a
n Couder
B
i
sec
t
:
t
each "bisect start
"
to optionally use
one
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Alex
Riesen
Fix passing of TCLTK_PATH to git-gui
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
unio
C Ham
a
no
Rename add_file_to_in
d
ex() t
o
add_file_to_cache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename static variable write_index to upda
t
e_i
n
dex
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
a
n
o
R
en
a
me in
t
e
rnal
function "add_file_to_cache"
in built
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
n
i
o C H
a
mano
Prop
a
gate cache error inter
n
a
l to refresh_cache(
)
v
i
a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C Hamano
Fix bog
u
s err
o
r m
e
ssa
g
e from me
r
ge-recursive error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Andy Pa
r
kins
Show binary file
s
ize
change in diff
-
-s
t
at
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Shawn
O
.
Pearce
H
o
nor -
p
<n> when applying git di
f
fs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C
H
amano
Fix dep
e
nd
e
ncy of common-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next