repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: support manual section (5) - file formats.
2007-04-20
Junio
C
Hamano
Documentation: support manual sec
t
i
o
n
(
5) - fil
e
formats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio
C Ham
a
no
Simplify c
o
de to find recursive m
e
rge dr
i
ver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
C
o
unto-fix in merge
-
recur
s
ive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Fix funny
types used i
n
attribut
e
value
represent
a
tion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
A
l
l
ow
low-level drive
r
to speci
f
y differen
t
behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom low-level merge driver: cha
n
ge the
con
f
iguration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
Allow the default low-lev
e
l
m
erge dr
i
ver t
o
be con
f
igure
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Custom l
o
w-
l
e
vel merge d
r
ive
r
support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Add a d
e
monstration/test of customi
z
ed merg
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
a
mano
Allo
w
specifyi
n
g
s
pec
i
alized merge-backend
p
er
path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Hama
n
o
merge-
r
ec
u
rsive: separat
e
out xdl_merge() in
t
erf
a
c
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
Allow more t
h
an tru
e
/false t
o
a
t
tribute
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ja
m
es Bo
w
es
Do
c
umen
t
git-c
h
e
ck-attr
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hama
n
o
C
h
a
nge attribute negation m
a
rker from
'
!' to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C
H
a
mano
Define
a
built-in
a
ttribute macro
"
binar
y
"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hama
n
o
a
ttribute m
a
cro support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Makefile: add
p
atch-ids
.
h back
i
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hama
n
o
Fix 'diff'
a
ttribute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C
H
a
man
o
Fix 'crlf' attribute semantic
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Hamano
Teach 'd
i
ff' about
'diff' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Define 'crlf' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C
H
amano
Add basic infrastructure
to assign attributes to paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C Hama
n
o
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-14
L
inu
s
Torvalds
git-quiltimport complaining yet stil
l
working
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
F
r
ank Lich
t
enheld
config
.
t
xt: Fix gram
m
atica
l
error in description of
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Fran
k
Lichtenhel
d
conf
i
g
.
txt: Change pserv
e
r
to server in
de
s
cription
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Frank Li
c
htenhel
d
co
n
fig
.
tx
t
: Document core
.
autocrlf
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Fr
a
nk Licht
e
nheld
confi
g
.
txt: Document gitcvs
.
allb
i
na
r
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C Hamano
D
o no
t
d
efault to --no-index
when
g
iv
e
n two directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Alex Riesen
Use rev-list
--r
e
v
e
rs
e
in git-rebase
.
sh
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
M
erg
e
b
ranch 'jc/che
r
ry'
commit
|
commitdiff
|
tree
2007-04-13
J
unio C
H
amano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-13
M
a
tthias Lederhofe
r
ha
n
dle_opti
o
ns in gi
t
wrappe
r
miscounts the options
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
io C Hamano
Fix git
{log,show,
.
.
.
} --
p
retty=emai
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
S
h
awn O
.
P
earce
Don't
yap ab
o
ut merge-subtr
e
e during ma
k
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
i
o
C
Hamano
Documentati
o
n: --che
r
ry-pi
c
k
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Haman
o
git-
l
o
g
-
-
cherry-pi
c
k A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ham
a
n
o
Refactor pa
t
c
h
-id filtering
out o
f
g
i
t-cherr
y
and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Ad
d
%
m
to '--pretty=format:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jim
M
eyering
sscanf/st
r
toul: parse integer
s
robustly
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Robin H
.
Johnson
Add testcase for for
m
at-patch --subjec
t
-
p
refix (take 3)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Rob
i
n H
.
Johnson
A
dd cu
s
t
o
m
s
ubject prefix support
t
o format-pa
t
ch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
GIT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Frank Lichtenheld
cv
s
server: Fix h
a
ndl
i
ng of
diapp
e
ared fil
e
s
on
u
p
d
ate
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
J
unio C
Hamano
fs
c
k: do not
complain on
d
eta
c
hed HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
J
i
m Me
y
e
ring
(encode_8
5
,
d
e
code_85
)
: M
a
rk source
b
uff
e
r
po
i
nter
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Frank Li
c
htenheld
gitweb: Al
l
ow configurin
g
the default pro
j
e
cts order
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
F
rank Li
c
htenheld
gitweb:
A
llow
f
o
r
ks
with
pro
j
ect list file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C
Hama
n
o
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-10
Ju
l
ian Phill
i
ps
Docum
e
ntation: show-ref: document --excl
u
d
e
-
exist
i
n
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Tomash Brechko
c
vsexportcommit -p : f
i
x the usage of git-app
l
y -C
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Re
n
é Scharfe
git-archive: make t
a
r the de
f
ault format
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Hamano
Merge branch 'jc/
p
ush'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Hamano
Merge
branc
h
'j
c
/
merge-subt
r
e
e
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C H
a
mano
Me
r
g
e branch 'js/fetch-pr
o
gress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge br
a
nch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-09
J
unio C
Ham
a
no
Add
D
o
c
umentation/cmd-list
.
made to
.
git
i
gnore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Eric
Wong
git-svn: fix log
command to avoi
d
infi
n
ite l
o
op on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Eri
c
W
o
ng
g
it-s
v
n: d
c
ommit/reb
a
s
e
confused by patches
w
ith gi
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wong
git-svn: bail out
on inco
r
rec
t
command-line options
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
S
tart
1
.
5
.
2 cycle by prepareing Rel
N
otes
f
or it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Ha
m
ano
Merge
b
ranc
h
'
j
c/read-tree-
d
f
' (early part
)
commit
|
commitdiff
|
tree
2007-04-08
Junio C
Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Pre
p
are
f
o
r
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
F
r
a
nk Lichtenheld
cvs
s
e
r
ver: smal
l
c
o
rre
c
tions
t
o asciid
o
c do
c
umentat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io
C
H
a
ma
n
o
A new merge strage
t
y 'subt
r
e
e
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C
Ha
m
ano
g
i
t-push to
mu
l
ti
p
le locations does n
o
t
s
top at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
git-push repo
r
t
s
t
he
URL after fa
i
li
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
Merge b
r
a
n
ch 'jc
/
index-ou
t
put'
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
M
erge
branch '
f
p/make
-
j'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C Hamano
M
erge branch 'cc/bis
e
ct'
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Haman
o
Merge branch 'jc/checko
u
t
'
(
early part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
Merge branch
'
mai
n
t'
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C
Ham
a
no
D
ocumenta
t
ion:
tighten d
e
penden
c
y
for git
.
{
html,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
A
r
je
n
Laa
r
hoven
Makefile: iconv
(
) o
n
D
a
rwin has the old
i
nterface
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arje
n
Laarhoven
t5300-pa
c
k-ob
j
ect
.
sh: po
r
tabili
t
y issue using /usr
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hama
n
o
git-bisect: allow bisecting with on
l
y one
b
ad commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C Hamano
t6030: add a bi
t
m
ore
t
e
st
s
to git-bis
e
ct
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laa
r
hoven
t3200-branch
.
sh: smal
l
lang
u
age nit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarhoven
u
s
ermanual
.
txt: some cap
i
talizati
o
n nits
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Lar
s
Hjemli
Make
b
u
ilt
i
n-branch
.
c handle the git config file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Lars Hjem
l
i
rename_ref(): only print a warning
when
c
onfig-fil
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Brian Gernhardt
Disting
u
ish
branches by more
than cas
e
in te
s
ts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
YOSH
I
FUJI H
i
deaki
.
.
.
Avoid
c
omposing too long "R
e
ferences" heade
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Fran
k
Lichtenheld
cvsimp
o
rt:
I
m
p
r
o
v
e
formating consistency
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenheld
cvsimport: Reord
e
r o
p
t
i
ons in documentation for b
e
tter
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank L
i
c
h
tenh
e
ld
cv
s
import: Improve
usage error reporting
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
F
r
ank Lichten
h
eld
cv
s
i
m
p
ort: Improve document
a
ti
o
n
o
f CV
S
ROOT and CVS
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichten
h
eld
cvsimport: sync usage
lines with exist
i
ng options
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hamano
git-b
i
sect: m
o
der
n
i
zation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Hamano
M
er
g
e branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-05
Dan
a
How
F
i
x lseek(2) calls with args 2
and 3 swapped
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
F
ernand
o
J
.
Pereda
Makefi
l
e: Ad
d
'+
'
to QUIET_SU
B
DIR0 to f
i
x
parallel
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Christian Couder
Documentation: bisect
:
"
start"
a
ccepts one bad and
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Chris
t
ian Couder
Bisect: teach "bis
e
ct
start" to optionally use one
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Alex Riesen
Fix passin
g
of TCLTK_PA
T
H to git-gui
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o C Hamano
Rename add_fi
l
e
_
to_index() to
a
dd_file_to_
c
ache()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename st
a
tic vari
a
ble w
r
ite_index to update_in
d
ex
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
mano
Rename internal
function
"
add_file
_
to
_
cac
h
e" in builtin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next