repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
mergetool-lib: add a three-way diff view for vim/gvim
2010-09-15
Dan
M
cGee
mergetoo
l
-
l
ib: a
d
d a three-wa
y
diff view for v
i
m/gv
i
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-15
Dan Mc
G
ee
me
r
getool-lib
:
combine vimdiff an
d
gv
i
mdif
f
run bl
o
c
ks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-12
Jun
i
o C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-09-12
Junio C
H
amano
t3101: modernise style
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-12
Rams
a
y Jones
vcs-s
v
n: Fix some printf fo
r
m
at compiler warnings
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-11
René Scharfe
c
om
p
at/nedmallo
c
:
don't force NDEBUG on the rest of
g
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Junio C Hamano
Git 1
.
7
.
3 rc
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Junio C Hamano
Merge bran
c
h 'np/re
l
n
o
t
es-in
-
subdir'
commit
|
commitdiff
|
tree
2010-09-10
J
unio C
H
amano
Prepar
e
f
or 1
.
7
.
3 r
c
1
commit
|
commitdiff
|
tree
2010-09-10
Junio
C Ha
m
ano
Merge bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2010-09-10
Mark
Lodato
c
o
nfig
.
txt: fix
p
lace
m
e
n
t of diff
.
nopre
f
ix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Brandon Cas
e
y
t/t4018: a
v
oid
t
wo un
n
e
c
e
ss
a
ry sub-shell in
v
oca
t
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Junio C Hamano
M
e
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-09-10
Bran
d
on
C
asey
t/t4018: t
e
st whe
t
her the word_regex p
a
tterns compile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Brandon Casey
x
d
i
f
f
-int
e
rface
.
c: always trim trail
i
ng s
p
ace
f
rom
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Brandon Ca
s
ey
diff
.
c: call
r
e
g
f
ree to free memory all
o
cated
b
y regcomp
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Bra
n
don Casey
t/t
5
5
1
0-fetch
.
sh
:
impro
v
e testing with explicit URL
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Brandon Casey
bui
l
tin/fetc
h
.
c:
comment th
a
t br
a
nch
-
>re
m
ote_name
i
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Brandon Casey
Makefile
:
use com
p
a
t
regex on
IRIX 6
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Brandon Casey
t/t70
0
8
: workaround
b
roken handling of \000 by printf
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Junio C Hamano
install-webd
o
c:
k
eep insta
l
led
R
elNotes-
*
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-08
J
u
n
io C Hamano
M
erge branch
'
t
f
/cleanup-buil
t
in-help
-
header
s
'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Haman
o
Merge branch 'jk/test-must-fail-m
i
ssing'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Merg
e
bran
c
h 'jh/
e
rro
r
-
r
emovi
n
g-missing-note'
commit
|
commitdiff
|
tree
2010-09-08
Junio C
H
a
m
ano
Me
r
ge branch 'kf/askpass-conf
i
g'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
M
e
rge branch 'bc/maint-
f
etch-url-only'
commit
|
commitdiff
|
tree
2010-09-08
J
unio C Hamano
M
e
rge branch
'
j
k/maint-pas
s
-
c
-
con
f
ig-in-env'
commit
|
commitdiff
|
tree
2010-09-08
Jun
i
o C Hamano
Merge branch 'en/d-f-conflict-f
i
x'
commit
|
commitdiff
|
tree
2010-09-08
Johannes S
i
xt
fast-export:
e
nsur
e
that a renamed file is pr
i
nted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-07
Ni
c
olas Pit
r
e
Documentation: move RelNotes into a direc
t
ory
o
f t
h
eir own
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-07
J
unio
C
Haman
o
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-09-07
El
i
jah Newren
reve
r
t: Fix trivial c
o
mm
e
nt sty
l
e issue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-07
Elijah Newr
e
n
ca
c
he_tree_free: Fix sm
a
ll
memory leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
Jun
i
o C Ham
a
n
o
Merge branch 'jh/clean-exclu
d
e'
commit
|
commitdiff
|
tree
2010-09-06
Thiago Fa
r
ina
bui
l
tin/cl
e
a
n
.
c: Use S
T
RING_LIST
_
INIT_NO
D
UP
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
Jens Lehmann
t3404 & t7508:
cd inside s
u
bshell instead of arou
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
Juni
o
C Ham
a
n
o
Me
r
ge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-09-06
J
u
nio C Hamano
Merge bra
n
ch '
x
x/trivial
'
i
nto main
t
commit
|
commitdiff
|
tree
2010-09-06
J
uni
o
C Ha
m
an
o
t
a
g
.
c: whitespace
br
e
akages fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
Jared Hance
Fix whitespace issue in object
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
J
ens Lehmann
t
5505: add missin
g
&&
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-04
Junio C Hamano
Merge branch 'jl/submod
u
le-ignore-dif
f
'
commit
|
commitdiff
|
tree
2010-09-04
Junio C Hamano
Mer
g
e
branch 'ab/t
e
st-2'
commit
|
commitdiff
|
tree
2010-09-04
Junio C Ham
a
no
M
er
g
e bran
c
h 'js/detached-
s
tash'
commit
|
commitdiff
|
tree
2010-09-04
J
unio C Hamano
Me
r
g
e bra
n
c
h
'js/maint-reflog-beyond-hor
i
zon'
commit
|
commitdiff
|
tree
2010-09-04
Juni
o
C Hamano
Merg
e
bra
n
ch
'
dg/l
o
c
a
l-mod
-
error-mess
a
g
e
s'
commit
|
commitdiff
|
tree
2010-09-04
Junio C Hamano
Mer
g
e
b
ranch 'nd/m
a
int-fix-
r
eplace'
commit
|
commitdiff
|
tree
2010-09-04
Nguy
ễ
n
T
hái Ngọc Du
y
par
s
e_ob
j
ect: p
a
ss on the original
sha1, not the replaced one
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
J
unio C Haman
o
Merge branc
h
'ab/comp
a
t-regex'
commit
|
commitdiff
|
tree
2010-09-03
Junio C
Ha
m
ano
Merge branch 'nd/clo
n
e
-depth
-
zero'
commit
|
commitdiff
|
tree
2010-09-03
Junio
C
Ham
a
no
Merge b
r
anch 'jn/m
a
int-doc-user-manu
a
l-html-doctype'
commit
|
commitdiff
|
tree
2010-09-03
Junio C
H
amano
M
e
rge br
a
nch 'cb/maint-mergetool-no-tty'
commit
|
commitdiff
|
tree
2010-09-03
Ju
n
io C Ham
a
n
o
M
erge branch 'j
n
/a
p
ply
-
fi
l
ename-with-sp'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge branc
h
'jn/m
e
rge-custom-
n
o
-
t
r
iv
i
al'
commit
|
commitdiff
|
tree
2010-09-03
Juni
o
C H
a
man
o
Merge branch
'j
c
/maint-doc-em-dash'
commit
|
commitdiff
|
tree
2010-09-03
Ju
n
io
C
Hamano
Mer
g
e bra
n
ch '
m
g/doc-bundle'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge b
r
a
n
ch 'jn/
d
oc-ba
c
kslash'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Ham
a
no
Merge branch 'jn/update-contri
b
-
e
xampl
e
-merge'
commit
|
commitdiff
|
tree
2010-09-03
J
u
nio C Hamano
M
e
r
ge branc
h
'jn/merge-
r
e
normalize'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Ham
a
n
o
Sync
w
ith 1
.
7
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hama
n
o
Git 1
.
7
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Thiago Fari
n
a
buil
t
in/merge_recurs
i
ve
.
c
:
Add an
usage
s
t
r
ing and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
J
ens Lehm
a
nn
t7406 &
t
7
407
:
add mi
s
sing && at end of li
n
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Jens Lehmann
t7405:
c
d inside su
b
she
l
l instead
o
f a
r
ound
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Matt
h
ieu Moy
t760
9
-merge-co-error-m
s
gs: te
s
t non-fast f
o
rw
a
rd ca
s
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Matt
h
ieu
M
oy
Move "sh
o
w_al
l
_err
o
r
s
= 1" to set
u
p_unpack_trees_porcelain()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Matthieu Moy
setu
p
_unpack_
t
ree
s
_porcel
a
in: take the whole options
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
M
a
tthieu Moy
Move set
_
porce
l
a
in_error
_
m
sgs
t
o unpack-trees
.
c and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
Junio C H
a
m
ano
Prepar
e
for
1
.
7
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
J
u
nio
C
Ha
m
ano
Merge
bran
c
h
'maint
'
commit
|
commitdiff
|
tree
2010-09-01
Ju
n
io C Hamano
Prepare for 1
.
7
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
J
unio C Hamano
Merge
branch 'gp/pac
k
-refs-remove-empty-di
r
s
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
J
u
n
i
o C Hamano
Merge
br
a
nch 'sg/rerere-gc-o
l
d
-
s
t
ill-us
e
d'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2010-09-01
J
u
n
i
o C Hamano
Merge bra
n
ch 'np/maint-hug
e
-
delta-ge
n
er
a
t
ion' into
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Junio C
H
am
a
n
o
M
e
rge branch
'
dj/fetch-tagopt' into
ma
i
nt
commit
|
commitdiff
|
tree
2010-09-01
J
u
ni
o
C
H
aman
o
Mer
g
e bran
c
h 'da/fix-s
u
b
module-sync-s
u
perproject-
c
onfig
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
Mer
g
e
bran
c
h 'en/rebase-ag
a
inst-reba
s
e-fix' into m
a
int
commit
|
commitdiff
|
tree
2010-09-01
J
u
nio C Hamano
ins
t
all-webdoc:
filter
timesta
m
p
-only changes correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
Th
i
a
g
o Farina
built
i
n
.
h: M
o
ve two functio
n
s definitions to help
.
h
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Junio C
H
amano
Merge b
r
anch 'np
/
ma
i
nt-huge-delta-genera
t
ion'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge bran
c
h 'da/fi
x
-s
u
bmodule-
s
ync-su
p
erproje
c
t-config'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch 'jn
/
cherr
y
-revert-message-cl
e
an-up
'
commit
|
commitdiff
|
tree
2010-08-31
Junio
C
H
a
man
o
M
e
rge br
a
nch 'cb/
b
inary
-
patch-id
'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge bran
c
h 'ab/maint-r
e
set-mixed-w-p
a
thsp
e
c-
a
dvice'
commit
|
commitdiff
|
tree
2010-08-31
J
u
nio C Hamano
Merge
b
ranc
h
'dj/fetch-tagopt'
commit
|
commitdiff
|
tree
2010-08-31
Ju
n
io C Hamano
Merge branch
'en/d-f-conf
l
ict-fix'
commit
|
commitdiff
|
tree
2010-08-31
Junio
C
Hamano
Merge branch
'j
n
/sv
n
-fe'
commit
|
commitdiff
|
tree
2010-08-31
Ju
n
io C Hamano
Merge
b
ranch
'
tr/main
t
-no-unquote-plus
'
commit
|
commitdiff
|
tree
2010-08-31
Junio
C Hamano
M
e
r
ge branc
h
'jn/paginate-fix'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge bran
c
h 'jn/maint-setup-fi
x
'
commit
|
commitdiff
|
tree
2010-08-31
Ju
n
i
o C Hamano
Me
r
ge bra
n
ch 'en/fast-export-fix'
commit
|
commitdiff
|
tree
2010-08-31
Junio
C
Hamano
Merge branch 'hv/autosqua
s
h-confi
g
'
commit
|
commitdiff
|
tree
2010-08-31
Junio
C Hamano
Merg
e
b
r
anch 'sg/rerere-gc-ol
d
-s
t
ill-used'
commit
|
commitdiff
|
tree
2010-08-31
Matthieu Moy
tests: factor HOME
=
$
(
p
w
d
)
in test-lib
.
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Ævar Arn
f
jörð Bjarmason
test-lib: use subsh
e
ll ins
t
ead
of cd
$
n
ew &&
.
.
&
&
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Jo
n
at
h
an N
i
eder
tests:
s
implify
"m
i
ssing PREREQ"
message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Ævar Arnf
j
ö
rð Bjarmason
t/t0000-
b
asic
.
s
h
:
Run th
e
pa
s
sing
TOD
O
t
e
st ins
i
de
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Ævar
A
rnfjörð
B
jarmason
test-lib: A
l
low overridin
g
o
f TES
T
_
D
I
RE
C
TORY
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Æva
r
Arnfjör
ð
B
jarmason
test-li
b
: Use "$GIT_BUILD_D
I
R"
i
nstead of "$TEST_DIRECTORY
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Ævar Arnfj
ö
rð B
j
armason
test-
l
ib: Use
$
TEST_DIRECTO
R
Y or
$
GIT_BUILD_DIR instead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next