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
Merge branch 'jc/checkout'
2006-07-07
J
unio C Hamano
git log -
p
--merg
e
[[--] paths
.
.
.
]
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Johannes Schinde
l
in
Mak
e
file
:
export NO_
S
VN_TES
T
S
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Junio C
Hamano
Update diff-options a
n
d c
o
nfi
g
documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Juni
o
C
Ham
a
n
o
diff
.
c
: --no-color
t
o
d
efeat diff
.
color configuration
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Eric Wong
diff
.
c: r
e
spe
c
t diff
.
renames config option
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Ste
p
h
an Fede
r
diff-op
t
ions
:
Explain
-
-text an
d
-a
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
S
t
ephan Feder
Add -a and --text
t
o
common diff o
p
tions he
l
p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
St
e
pha
n
Feder
Teac
h
diff -a as shorthand for --t
e
xt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Stephan
Feder
Teach --text option t
o
diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Jakub
N
a
rebski
send-email: format 2
8
22 dates
t
ring
o
urselv
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
S
t
e
phan Feder
Do not
d
rop data from '\0' until eol
i
n
patch
o
utput
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
E
ric Wong
builtin-l
o
g:
res
p
ect diff co
n
figura
t
ion options
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Junio C Hamano
git-s
v
n:
migrate out o
f
c
o
ntrib (f
o
llow-up)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Junio C Ham
a
no
rev-pa
r
se documenta
t
ion: ta
l
k a
b
out range notation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Junio C Hamano
show-b
r
anch: match documentat
i
on and usag
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Junio C Hama
n
o
Merge branch
'
j
s
/mer
g
e-base
'
commit
|
commitdiff
|
tree
2006-07-07
Junio C Hama
n
o
bu
i
ltin-rev-par
s
e
.
c: co
n
stness
tig
h
tening
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Jun
i
o
C Hamano
diffc
o
r
e-
r
ename: tr
y
matching up r
e
na
m
e
s w
i
thout populatin
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Er
i
c
Wong
g
it-svn: migra
t
e out of c
o
n
t
r
i
b
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-07
Junio C Ham
a
no
Me
r
ge branch
'
ew
/
i
nstaweb'
commit
|
commitdiff
|
tree
2006-07-06
J
oac
h
i
m
B
erdal Haga
c
ore
.
c
ompression documentation formatting
fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-06
J
un
i
o
C Hama
n
o
mailinfo:
as
s
ume input
i
s latin-1
o
n
t
he header as
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-06
Junio C Hamano
git-res
e
t: co
m
plain and exit
u
pon seeing an
u
nkn
o
wn
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-05
Jun
i
o C
H
amano
git-g
r
ep: boolean
express
i
on on
p
attern mat
c
hin
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-05
Junio C
H
amano
Merg
e
b
ranch 'l
t
/gitweb'
commit
|
commitdiff
|
tree
2006-07-05
J
unio
C Hamano
M
erge branch 'jc/fmt-merge-msg-tes
t
'
commit
|
commitdiff
|
tree
2006-07-05
Junio C Hamano
Mer
g
e branch '
j
c/sha1'
commit
|
commitdiff
|
tree
2006-07-05
Junio C Hamano
Mer
g
e branch
'
jc/diff-test'
commit
|
commitdiff
|
tree
2006-07-05
J
u
ni
o
C Hamano
M
erge
b
ranch 'th/diff'
commit
|
commitdiff
|
tree
2006-07-05
Junio C Hama
n
o
M
erge branch 'jc/grepfix'
commit
|
commitdiff
|
tree
2006-07-05
Junio C Haman
o
Merge branch 'js/fmt-merge-msg
'
commit
|
commitdiff
|
tree
2006-07-05
Ville Skytt,Ad(B
Fix
pri
n
t-log and
di
f
f
compatibility with
recent
v
c
.
.
.
commit
|
commitdiff
|
tree
2006-07-05
Eric Wo
n
g
git-svn: avoid fetc
h
ing files o
u
tsid
e
of th
e
URL we
.
.
.
commit
|
commitdiff
|
tree
2006-07-05
Ju
n
io C
H
amano
Re
-
fix clea
r
_commit_
m
ar
k
s(
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
Linus Torvald
s
Improve git
-
peek-remote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
Rene
Scharfe
rev-list: free commi
t
_l
i
st
in
.
.
.
handler
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
Junio
C
Hamano
git-gre
p
: use
a bit more specific
e
r
ror messages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
Junio
C
Ham
a
no
git-
g
rep: fix
e
xit
c
od
e
w
h
en
w
e u
s
e external grep
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
Junio
C
Haman
o
git-grep: fi
x
p
a
rsing of paths
p
ec sepa
r
a
t
o
r
'--
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
Sa
n
ti B
é
jar
Teach
r
ev-par
s
e the
.
.
.
syntax
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
Er
i
c Wong
t
800
1
-annotate: fix a b
a
sh-
i
sm in this
test
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
J
ohannes S
c
hind
e
lin
Make gi
t
-fm
t
-mer
g
e-m
s
g
a
b
uiltin
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
J
u
n
io C Hamano
t6200: fmt-merge-m
s
g t
e
s
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
Jun
i
o C Hamano
send
-
email:
d
o
n
o
t barf
w
hen T
e
rm::
R
eadLine
d
o
e
s not
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
Jun
i
o C Hamano
b
o
olean: accep
t
yes and no as w
e
ll
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
Ryan Anderson
an
n
otate: Correct most merge f
o
llowing to anno
t
ate
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-04
Ryan A
n
derson
annotate
:
S
upport annotatio
n
of
f
iles on other revisi
o
ns
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-03
Joachi
m
B
H
aga
Ma
k
e
z
l
ib compression
level confi
g
ura
b
l
e
, and change
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-03
Junio C
Hamano
Mer
g
e
branch 'maste
r
' into js/
m
er
g
e-
b
ase
commit
|
commitdiff
|
tree
2006-07-03
Jun
i
o
C Ha
m
a
n
o
revert clear-commit-marks
f
o
r now
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-03
Juni
o
C
H
amano
g
et_merge_bases: clean
up e
v
en
w
h
en there is no
common
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-03
J
u
nio C
Hamano
M
a
kefile: ti
g
hten git-h
t
tp-{fetch
,
push}
d
ependenci
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-03
Jakub Narebski
aut
o
conf: Use
a
utoco
n
f to w
r
ite ins
t
al
l
ation dir
e
ctories
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-03
R
o
b
i
n Ros
e
nberg
Empt
y
author may be presen
t
ed by svn as an e
m
pty string
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Junio C Hamano
com
m
it
.
c: do not r
e
define UNI
N
TERESTING b
i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
E
r
i
c Wong
instaweb: fix
u
nportable ';' u
s
age in sed
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Johannes Schindelin
Mak
e
file: replace ugly
and unportable sed invoc
a
t
i
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Rene Sch
a
rfe
Fold get_merge_bases_cl
e
an() into g
e
t_merg
e
_
bases()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Linus Torvalds
r
e
v
ision
.
c: fix
"
dense" und
e
r --remove-em
p
t
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Junio
C Ha
m
an
o
builtin-diff: turn recursiv
e
on when
d
efa
u
lting
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Junio C Haman
o
t
4
013: add "diff" UI program tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Eric Wong
Add git-i
n
staweb, instan
t
ly bro
w
se the wor
k
i
ng repo
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Dennis Stosberg
gi
t
web: Declare global variabl
e
s wi
t
h "our"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Lube
n
Tuikov
gitwe
b
: Enable tre
e
(di
r
ect
o
ry
)
history
di
s
pl
a
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Junio C
Hamano
gitw
e
b: optimize pe
r
-file hist
o
ry generat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Dennis S
t
osberg
g
i
tweb: Declare
glo
b
al variab
l
es
with "our"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Luben
Tuikov
gitweb: Enable tr
e
e
(dire
c
tory) history displ
a
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Junio C Ha
m
ano
gitw
e
b: op
t
imize per
-
fi
l
e hi
s
tory gene
r
a
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
L
i
nus Torvalds
git ob
j
e
c
t hash cl
e
anups
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Linus Torvalds
revis
i
on
.
c: --fu
l
l-history
fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Rene Schar
f
e
Make clear_commit_marks() c
l
ean h
a
rder
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Ren
e
Scharfe
Add '
.
.
.
'
o
perator for
revi
s
ions
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Rene
S
charfe
Add get_merge_bases_cl
e
a
n
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
P
et
r
Baudis
F
ix errno usage i
n
connect
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
R
o
bin Rosenberg
Minor documentati
o
n f
i
xup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-01
Eric W
o
ng
git
-
svn: allo
w
a
local targe
t
directory to b
e
specifie
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-01
Nicolas
P
itre
don't load objects needlessly when repacking
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-01
Juni
o
C Hamano
uplo
a
d-pack
.
c: <sys/poll
.
h> i
n
cludes
<ctype
.
h> on
O
penBSD 3
.
8
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-30
Jakub Narebski
Rename man1 and man7 va
r
iable
s
to m
a
n1dir and
man7dir
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-30
Jakub Narebs
k
i
A
l
low
INS
T
A
L
L,
b
indir, m
a
ndir to be set
i
n
main Makefi
l
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-30
L
i
nus Torvalds
Abst
r
act out acce
s
ses
t
o ob
j
ect hash a
r
ray
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-30
Nico
l
a
s
Pitre
consider previous pack
und
e
ltified object state on
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-30
Junio C Haman
o
Merge
b
r
anc
h
'
jc/test-3402'
commit
|
commitdiff
|
tree
2006-06-29
Linus
T
orvalds
Do
not
t
ry futile
o
b
j
e
ct pa
i
rs when r
e
packin
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
Racy GIT
(
part #3)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Johann
e
s Schindelin
move get
_
merge
_
bas
e
s
() to
c
ore lib
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Joh
a
nnes Sch
i
ndelin
r
efactor merge_bas
e
s() as pr
e
paration to libif
y
merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
J
u
nio
C Hamano
Merge
bra
n
ch 'jc
/
di
f
f-t
e
s
t-updates
'
into th/diff
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
t40
1
3: note imp
r
ovemen
t
s broug
h
t by
the
n
ew out
p
u
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Junio C Haman
o
M
e
rge branch 'jc/diff-test' into jc/diff-
t
est-upd
a
t
e
s
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
M
e
r
ge
branch '
j
c/diff-test'
in
t
o th/diff
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
t
4013
:
ad
d
format-pat
c
h
tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Junio C
H
amano
format-
p
atch: fix
d
iff format option impl
e
mentation
commit
|
commitdiff
|
tree
2006-06-29
Jun
i
o C Hamano
Merge b
r
anch 'j
c
/repack'
commit
|
commitdiff
|
tree
2006-06-29
Junio C
H
a
m
a
n
o
Merg
e
br
a
n
c
h 'j
s
/patch'
commit
|
commitdiff
|
tree
2006-06-29
J
unio
C Haman
o
diff
.
c
: f
i
x get_patc
h
_id()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
J
unio C
H
a
m
ano
t4014: fix
t
est co
m
m
it labels
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Linus Torval
d
s
Improved three-way blob mer
g
ing
c
od
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
L
inus Torval
d
s
Prepare "git-merge-tree" for future work
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Linus To
r
valds
x
d
iff: generat
e
"anti
-
diffs" aka
w
ha
t
is common to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next