repo.or.cz
/
git
/
jnareb-git
/
bp-gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t7609: test merge and checkout error messages
2010-08-11
D
iane Gasse
l
in
t7609: test merg
e
and che
c
kou
t
error messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Matthieu Moy
u
n
pack_t
r
ees: group error mes
s
ages by ty
p
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Matthieu Moy
me
r
ge-
r
ecursi
v
e: disting
u
ish "rem
o
ved" and "overwritten
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
Diane Gas
s
elin
m
er
g
e-recursiv
e
: porcelai
n
m
e
ssages
f
o
r checkout
8ccba008 (
Junio C Hamano
, Sat May 17 21:03:49 2008, unpack...
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-11
M
a
tth
i
e
u Moy
Turn u
n
p
ack_trees_o
p
tion
s
.
msgs into an arr
a
y + enum
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Juni
o
C Hamano
Git 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Hamano
tests
:
cor
r
ect "doe
s
r
eflo
g
e
xist?" t
e
sts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Bran
d
on
Casey
t/:
w
ork
a
r
oun
d
one-shot variable assig
n
ment with test_must_f
a
i
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
J
o
nathan Nieder
t/README:
correct an ex
c
eption when breaking a && chain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Bran
d
on Casey
t/{t5541,lib-httpd}
:
replace problematic
'
!()' n
o
tation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon C
a
sey
t/t3700: con
v
e
rt two us
e
s
of nega
t
ion operator
'
!
'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Junio C Hamano
M
e
rg
e
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-07-20
B
r
a
ndo
n
Casey
t/R
E
ADME:
clarify test_must
_
fail description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Gre
g
Brockman
Check size of path bu
f
fer
b
efore writing i
n
to
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Jun
i
o C Hamano
Merg
e
bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Thielow
up
d
ate-server-info:
Shorten read_
p
ack_info_file
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð Bjarmason
git add:
A
dd --
i
gnore-mi
s
sing
t
o SYNOPSIS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjö
r
ð B
j
ar
m
a
s
on
g
i
t s
u
bmodule a
d
d:
R
em
o
ve old docs about implicit -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehmann
git submo
d
ule
a
dd: Require th
e
n
e
w --for
c
e option to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Ha
m
ano
Merge b
r
an
c
h 'j
l
/add-n-
i
gno
r
e-missing
'
commit
|
commitdiff
|
tree
2010-07-19
D
a
vid Aguilar
Documentation: Explain git-mergetoo
l
's use of temporary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Juni
o
C
H
amano
Me
r
ge bran
c
h
'
jc/diff
-
merge-b
a
se-mul
t
i'
commit
|
commitdiff
|
tree
2010-07-16
Thomas Rast
Only run
a
ggregate-re
s
ults ov
e
r actual cou
n
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jonath
a
n Niede
r
Add a sampl
e
user for the svndump library
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
J
u
nio C Hamano
di
f
f
A
.
.
.
B: do not limit the syntax too narr
o
wly
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'jn/paginate-fix'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hamano
Merge branch 'wp/merge-tree
-
fix'
commit
|
commitdiff
|
tree
2010-07-15
J
uni
o
C Hamano
Merge bra
n
ch 'js/merge-rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
e
rge
b
ranch 'jc/dif
f
-merge-base-multi'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
branch 'n
s
/merge-recurs
i
ve
-
u
ptodat
e
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
no
Merge branch 'jn/
t
ests'
commit
|
commitdiff
|
tree
2010-07-15
J
un
i
o
C
Hamano
Me
r
ge branch
'
eb/doc-log-manpa
g
e'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
b
ranch '
j
n/
g
rep-open'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch
'
mg/revision-doc'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
M
e
rge branch 'jk/maint-status-keep-
i
nde
x
-timestamp'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Ham
a
no
Merge branc
h
'jc/r
e
base-i-comm
i
t
-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
M
erge
branch '
a
b/s
u
bmodule-add-f
'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
M
e
rge branch 'bc/maint-makefi
l
e
-f
i
xes'
commit
|
commitdiff
|
tree
2010-07-15
J
u
n
i
o C Hamano
M
erge branch 'maint
'
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
Do
c
umentation: add
submodule
.
* to the big
conf
i
guration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
gitmodu
l
e
s
.
5: url can be a rela
t
ive path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Pavan Ku
m
ar Sunk
a
ra
gitweb: fix esc_url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan N
i
eder
gi
t
--paginate: pagin
a
te external commands
a
gain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jay Soffian
MERGE_RR is
in
.
g
i
t, not
.
git
/
rr-cach
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
merge-tree
:
fix where two branc
h
es share no c
h
anges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Wil
l
Palmer
ad
d
basic
tes
t
s for me
r
ge-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Ju
n
io
C H
a
mano
Git 1
.
7
.
2-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Ju
n
io C
H
amano
Merge
b
ranch 'jc/re
a
d-tree-cache-tree-fix'
commit
|
commitdiff
|
tree
2010-07-14
R
aja R Harinath
Use dev_t for device id (st_
d
ev) fro
m
stat in setup_git_dire
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Junio C Hamano
diff A
.
.
.
B: g
i
ve
o
ne possible diff wh
e
n there are mo
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
J
unio C Hamano
M
e
r
g
e
br
a
nch 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2010-07-13
Oren Held
git fetch document
a
tion: descr
i
be sh
o
rt '-p' synon
y
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-13
Miklos Vajna
f
o
rmat-patch: documen
t
the for
m
at
.
to co
n
figurat
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Jens L
e
hmann
git add:
A
dd the "--ignore-m
i
ssing" option
for the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
M
i
c
hae
l
J Gruber
t
e
st
-
li
b
: TAP co
m
pliance for skippi
n
g tests on request
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
Mi
c
ha
e
l
J Gru
b
er
test-
l
i
b
: simpl
i
fy
G
IT_SKIP_TESTS loop
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-12
J
unio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-12
Jonathan Ni
e
der
t3
0
00 (l
s
-files -
o
): mode
r
n
i
ze style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-10
Fredrik Skol
m
li
Docu
m
ent
a
tion:
S
pelli
n
g f
i
x in pr
o
t
ocol-cap
a
bilities
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicolas Sebrecht
mer
g
e
-recur
s
ive: use "up-to-date" in
s
tead of "uptodat
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Nicol
a
s Sebr
e
cht
checko
u
t: accord docu
m
entati
o
n to what
g
i
t
d
oe
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Johannes Sixt
t0005
:
work around strange $?
in k
s
h
w
hen pro
g
ram terminated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Junio C Hamano
Me
r
ge remote
branch 'ko/master'
in
t
o jc/
r
ead-
t
ree-c
a
che
.
.
.
commit
|
commitdiff
|
tree
2010-07-09
Bo
Y
a
ng
diff
.
c: f
i
x a graph outpu
t
bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Ævar Arn
f
jörð Bjarmas
o
n
tests: Use skip_
a
ll=* to
skip t
e
sts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
J
un
i
o
C
Hamano
Fi
x
"read
-
t
ree -m A B"
p
ri
m
ing the cach
e
-tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-09
Eli
B
arzilay
Reorgan
i
ze `git-log' man page to clar
i
fy comm
o
n
diff
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Nazri Ramliy
grep -O: Do not pass
color sequenc
e
s as f
i
lena
m
es
to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
J
unio C H
a
mano
Git
1
.
7
.
2-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
J
unio C Hamano
Merge bra
n
ch 'ab/tap'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Ha
m
ano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
back
m
erge a few mo
r
e fixes
to 1
.
7
.
1
.
X series
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
Merge b
r
anch 'maint-1
.
6
.
4
'
into maint
commit
|
commitdiff
|
tree
2010-07-07
Uwe Kleine-König
rev
-
parse: fix --parse
-
opt --keep-dash
d
ash
-
-stop-at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Jun
i
o C Hamano
Merg
e
branch 'mg/doc-
r
ev-parse-treep
a
th-syntax'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Junio
C
Hamano
Me
r
ge branch 'tr/recei
v
e-pa
c
k-alias
e
d
-
u
pdate-fix' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-07-07
Pierre Hab
o
uzit
fix git branch -m i
n
prese
n
c
e
o
f c
r
o
s
s
device
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
B
randon
C
as
e
y
t/t0006: specify time
z
one
as
EST5 not EST to com
p
ly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Junio C Hamano
do no
t
write out index when st
a
t
u
s does
no
t
have to
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Ju
n
io C Ham
a
no
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-07-07
Heik
o
V
oigt
add
missing && to submodule-merge testcas
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Jonathan Nieder
t/README: document more test
hel
p
ers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-07
Brandon Ca
s
e
y
Mak
e
file: work
around
k
s
h's fa
i
lure to handle
m
issing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Je
f
f
King
test-d
a
te: fi
x
sscanf type
c
onvers
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Junio C Hamano
M
e
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-06
Dylan R
e
id
x
d
i
ff:
optimise
f
o
r no whitespace dif
f
erence when ignorin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Jun
i
o C Hamano
r
ebas
e
-i: do not
get foole
d
by
a
l
o
g message ending
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-06
Junio
C Haman
o
rebase-i: style fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Michael J Gruber
Documentation:
lin
k
to gitrevisions r
a
ther than
git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Mi
c
hae
l
J G
r
u
ber
Document
a
tion:
gitrevisions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Mi
c
ha
e
l
J
Gruber
D
o
c
umentatio
n
: split off rev doc into incl
u
de file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
J
a
kub
Na
r
e
b
ski
gi
t
web: Move evaluate_gitweb_config out of run_
r
equest
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Jeff
K
ing
p
a
rs
e
_
date: fix signed
n
ess i
n
time
z
one calculation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
J
uni
o
C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-05
Jeff
King
t0
0
06: test timezone parsi
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Æv
a
r Ar
n
fjörð Bj
a
rmason
git su
b
module:
add submo
d
ules with git add -f <path>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Micha
e
l J Gruber
rerere
.
t
x
t: Doc
u
ment forget subcomm
a
nd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Junio C Hamano
t/REA
D
ME
:
propos
e
d re
w
o
rding
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Ævar Arnfjörð Bjarmaso
n
t/README: D
o
cument
the do's and d
o
n'ts
of
t
ests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-05
Ævar Ar
n
f
jörð Bjarmason
t/RE
A
DME: Add a s
e
ct
i
on
a
bout skipping
t
ests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next