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
t6020: Modernize style a bit
2010-09-30
Elijah Ne
w
re
n
t6
0
20: Moderni
z
e style a
b
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah
Newren
t6
0
22: Add
t
e
sts for ren
a
me/rename
combined
w
ith D
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
t6
0
2
2
: Add paired rename+D/F conf
l
ict: (two/file, one
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
Ne
w
ren
t6022: Add
tests with both rename source
& dest invol
v
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t602
2
: Add
tests for rever
s
in
g
ord
e
r of merges whe
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022: Add test
c
ombinations of {content conf
l
ict?
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h N
e
wren
t60
3
2
: Add a test checking
for
e
xcessive ou
t
pu
t
from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Junio C Ham
a
no
merge-rec
u
rsive: Restructure showing how to
c
hain more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Sch
a
lk, Ke
n
t30
3
0:
Add a
t
e
stcase f
o
r resolvab
l
e rename/add conflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-30
Junio C
H
amano
M
erge br
a
nch 'en/rena
m
e-d-f'
i
nto en/mer
g
e-recu
r
sive
commit
|
commitdiff
|
tree
2010-09-18
Junio C Ham
a
no
Git 1
.
7
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-18
Juni
o
C Ha
m
an
o
Merge b
r
an
c
h
'js/ls-
f
i
l
e
s
-
x-doc
'
commit
|
commitdiff
|
tree
2010-09-17
Chris J
o
hnsen
git-rebase--int
e
racti
v
e
.
s
h
: replace c
u
t with ${v
%
% *}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-17
Brandon Casey
t/t
7
300: wor
k
aroun
d
anci
e
nt touch by rearranging argument
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-16
J
unio C Ha
m
ano
Merge branch 'bg/fi
x
-t70
0
3'
commit
|
commitdiff
|
tree
2010-09-16
Juni
o
C H
a
m
a
no
ls-f
i
les
documentation: re
w
ord for cons
i
stency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-16
Jay Soffian
git-
l
s-files
.
txt: c
l
arify -x/--exc
l
u
de opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-15
Ju
n
io C Hamano
Git 1
.
7
.
3 rc2
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
M
erge branch '
d
r
/
maint-ls-tree-pre
f
ix-recursion
-
fix'
commit
|
commitdiff
|
tree
2010-09-15
Junio C H
a
mano
Merge
b
r
anch 'os/fix-r
e
b
a
se-d
i
ff-no-
p
refix'
commit
|
commitdiff
|
tree
2010-09-15
Junio
C
Hamano
Merge branch 'j
l
/fix-test'
commit
|
commitdiff
|
tree
2010-09-15
Junio C
Hamano
Merge br
a
nch
'ch/filter-br
a
nch-deprec
a
te
-
r
emap-to-ancestor'
commit
|
commitdiff
|
tree
2010-09-15
Junio C H
a
mano
Merge branch 'ch/maint-can
n
ot-create-b
u
nd
l
e-error'
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
Merge branch 'ks/recursiv
e
-ren
a
me-add-id
e
ntical'
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
Me
r
g
e
git:
/
/
r
epo
.
or
.
cz/git
-
gui
commit
|
commitdiff
|
tree
2010-09-13
B
r
ia
n
Gernhardt
t700
3
: Use test
_
co
m
mit instead of
c
ustom function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-12
J
u
n
i
o C Ham
a
no
M
e
rge br
a
nch
'
maint'
commit
|
commitdiff
|
tree
2010-09-12
J
u
nio C Ham
a
no
ls-tree $di $di
r
: d
o
not m
i
stakenly r
e
curs
e
into directories
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-12
Junio C Hamano
t3101: modernise
s
tyle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-12
Ramsa
y
Jones
vcs
-
svn: F
i
x some printf form
a
t compiler wa
r
nings
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-11
René Sch
a
rfe
c
o
m
p
a
t/nedmalloc:
d
o
n't force NDEB
U
G
o
n the rest
o
f git
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Junio C Hamano
Git 1
.
7
.
3
rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
J
unio C Hamano
Merge bra
n
c
h
'np/relnot
e
s
-
i
n-sub
d
ir'
commit
|
commitdiff
|
tree
2010-09-10
Junio C Ha
m
ano
Pre
p
are for
1
.
7
.
3
r
c1
commit
|
commitdiff
|
tree
2010-09-10
Junio C Ham
a
no
M
e
rge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-09-10
Mark Lodato
config
.
txt: fix placem
e
nt of diff
.
noprefix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Bra
n
don C
a
sey
t
/t401
8
: avoid tw
o
un
n
ec
e
s
s
ary sub-shell
i
nvocations
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Ju
n
io C
H
a
mano
M
erg
e
b
ranch
'maint'
commit
|
commitdiff
|
tree
2010-09-10
Brandon C
a
sey
t/t4018: test
w
h
e
t
h
er the word_regex patt
e
rns compile
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Bra
n
don Casey
xdiff-i
n
terface
.
c:
a
l
wa
y
s t
r
im tr
a
iling space
f
rom
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Brandon Case
y
diff
.
c: call regfree to free memo
r
y
allo
c
ated by reg
c
o
m
p
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
B
r
a
n
do
n
C
asey
t/t55
1
0-fetch
.
sh: improve testing wit
h
explicit U
R
L
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Brandon Casey
buil
t
in/fetch
.
c: co
m
ment that
b
r
a
nch
-
>remo
t
e_name
is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
B
r
andon Casey
Mak
e
file: use compat regex
o
n
I
R
IX 6
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
B
r
ando
n
Casey
t
/t7
0
0
8: workaround broken handl
i
ng
o
f \000 by printf
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Oded Shimon
Ad
d
-
-
src/dst-prefix to gi
t
-formt-patch
in git-rebase
.
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
E
lijah Ne
w
re
n
merge-recursive: D/F conflicts where was_a_dir/file
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-10
Eli
j
ah Newren
t3509: Add rename + D/F c
o
nflict testcase
t
hat recursi
v
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Junio C Hamano
install-webd
o
c
:
keep installed R
e
l
Not
e
s-*
.
txt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Jen
s
Lehmann
t1020
:
Get rid of
'cd "$HERE"' at the
s
tar
t
of each
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
J
onathan
N
i
eder
t2016
(
checko
u
t
-p)
:
ad
d
missing &&
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonathan Nieder
t
1
3
02
(
core
.
r
e
positoryve
r
sion)
:
s
t
yle tweaks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonathan Nieder
t2105 (gitfil
e
)
:
add m
i
s
sing &&
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonathan Nieder
t1
4
50 (fsck): remo
v
e
d
a
ngling object
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-09
Jonath
a
n Niede
r
tests:
sub
s
hell inde
n
tation stylefix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-08
Junio C Ham
a
n
o
Merge branch 'tf/
c
leanup-builtin
-
hel
p
-headers'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Merge branc
h
'jk/t
e
st-must-fail-m
i
s
sin
g
'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
M
e
r
g
e bra
n
ch 'jh
/
erro
r
-removing-miss
i
ng-note'
commit
|
commitdiff
|
tree
2010-09-08
Junio C
Ham
a
no
Merge
br
a
nch 'kf
/
askpass-con
f
ig
'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
M
e
rg
e
branch 'bc/
m
aint-fetc
h
-url-only'
commit
|
commitdiff
|
tree
2010-09-08
Ju
n
io C Hamano
Merge branch
'jk/maint-
p
ass-c-con
f
ig-in-env'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Mer
g
e branch
'en/d
-
f-co
n
flict-fix'
commit
|
commitdiff
|
tree
2010-09-08
Johann
e
s Sixt
fast-export:
ensure
t
hat a
r
enam
e
d file is pr
i
nted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-07
Nicol
a
s Pitre
D
o
cumentation: mo
v
e RelNotes into a
directory of
the
i
r own
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-07
Juni
o
C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2010-09-07
E
l
ijah N
e
wren
r
e
vert: Fix tr
i
v
ial comment st
y
le issue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-07
Eli
j
ah
Newren
cache_tre
e
_f
r
ee: Fix
s
mall mem
o
ry
leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
Junio C Hamano
Merge branch 'jh/clean
-
ex
c
lu
d
e'
commit
|
commitdiff
|
tree
2010-09-06
Thiago Farina
builtin/
c
lean
.
c: Use STRING_L
I
S
T_INIT
_
NOD
U
P
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
Junio C Hamano
Merge bran
c
h 'jl/maint-fix-test'
commit
|
commitdiff
|
tree
2010-09-06
Jens Lehmann
Several test
s
:
c
d inside subshell instea
d
of around
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
J
ens L
e
hmann
t
3
404 & t7508
:
cd insi
d
e subshell inst
e
ad of aro
u
nd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
J
u
nio C
Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2010-09-06
Junio C Hamano
Me
r
g
e branch 'xx/trivial' into mai
n
t
commit
|
commitdiff
|
tree
2010-09-06
Ju
n
io C Hamano
ta
g
.
c
: whitespace breakages
fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
Jared Ha
n
c
e
Fix wh
i
tespace iss
u
e in object
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
Jen
s
Le
h
m
ann
t5505:
a
d
d missin
g
&&
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-04
Ju
n
io
C Ham
a
no
Merge branch '
j
l/s
u
bmodule-ignore-
d
iff'
commit
|
commitdiff
|
tree
2010-09-04
Juni
o
C Hamano
Merge branch 'ab/test-2'
commit
|
commitdiff
|
tree
2010-09-04
Junio C Hamano
Merge
b
r
anch 'js/deta
c
he
d
-sta
s
h'
commit
|
commitdiff
|
tree
2010-09-04
Juni
o
C Hamano
Mer
g
e b
r
anch 'js/maint-r
e
flog-beyo
n
d
-hori
z
on'
commit
|
commitdiff
|
tree
2010-09-04
Jun
i
o C Hamano
Merg
e
bra
n
ch 'dg/lo
c
al-mod-error-mess
a
ges'
commit
|
commitdiff
|
tree
2010-09-04
Junio C Hamano
Merge branc
h
'nd/maint-fix-replace'
commit
|
commitdiff
|
tree
2010-09-04
Nguyễn Thá
i
Ng
ọ
c Duy
parse_
o
b
jec
t
: p
a
s
s
o
n the or
i
ginal sha
1
, not the
r
e
placed
one
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Schalk, K
e
n
RE: [PA
T
CH] Avoid rename/
a
dd conflict when
contents
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge bran
c
h 'ab/co
m
pat-re
g
ex'
commit
|
commitdiff
|
tree
2010-09-03
Junio C
Hamano
Merge branch 'nd
/
c
l
on
e
-depth-zero'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Me
r
ge branch 'jn/ma
i
nt
-
do
c
-
user-
m
anual-ht
m
l-
d
octy
p
e'
commit
|
commitdiff
|
tree
2010-09-03
Junio
C
Hamano
Merge branch '
c
b/m
a
int-mergeto
o
l
-
no-t
t
y'
commit
|
commitdiff
|
tree
2010-09-03
Juni
o
C Hamano
Me
r
ge
branch '
j
n/apply-filename-wit
h
-sp'
commit
|
commitdiff
|
tree
2010-09-03
Juni
o
C Ham
a
n
o
Mer
g
e
branch 'jn/merge-cu
s
tom-no-trivial'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Ha
m
ano
Mer
g
e
b
ranch
'jc/maint-doc-
e
m-dash'
commit
|
commitdiff
|
tree
2010-09-03
Junio
C
Haman
o
Merge
b
ranch 'mg/doc
-
bu
n
dle'
commit
|
commitdiff
|
tree
2010-09-03
Jun
i
o C Ham
a
no
Merge bran
c
h 'jn/doc-b
a
c
kslash'
commit
|
commitdiff
|
tree
2010-09-03
Ju
n
i
o
C
H
ama
n
o
Merge branch
'
j
n
/update-contrib-example-merge'
commit
|
commitdiff
|
tree
2010-09-03
Junio
C
Hamano
Merg
e
branch 'jn/merge-r
e
n
or
m
a
l
ize'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Sync with 1
.
7
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Git
1
.
7
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Thiago Farina
buil
t
i
n
/
merge_
r
ecursive
.
c: Add a
n
usage string and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
J
ens Lehmann
t7406
&
t7407: add
mi
s
sing && at
e
n
d
o
f
lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next