repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t6022: Use -eq not = to test output of wc -l
2010-11-17
Br
i
an
Gern
h
ardt
t
6
022: Use -
e
q not =
t
o test
ou
t
put
o
f wc -l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-10-21
Ju
n
io C H
a
mano
merge-r
e
cur
s
iv
e
:make_room_for_di
r
ecto
r
ies - work around
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
m
e
r
ge-recursive: Remove redundant path clearing for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
e
wren
merge-re
c
u
rsiv
e
: Make
room for
dir
e
ctorie
s
in
D
/F confli
c
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah New
r
en
handle_
d
el
e
te_m
o
dify():
Ch
e
ck whether D/F co
n
fl
i
c
t
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah New
r
en
merge_co
n
tent(): C
h
ec
k
whet
h
er D/F
c
o
nflic
t
s are still
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elij
a
h Newren
con
f
l
i
c
t_ren
a
me_r
e
name_
1
to2(): Fix ch
e
cks for presence
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
conflict_rename_delete(): Check whet
h
er D/F conflicts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
mer
g
e-recur
s
i
ve: D
e
lay modify
/
del
e
t
e conflicts if D
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
merg
e
-recursive: De
l
ay con
t
e
nt
m
er
g
ing for renames
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: De
l
ay
hand
l
ing
o
f rename/de
l
e
te c
o
nflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
El
i
j
a
h Newren
merge-recursive:
M
ove
h
an
d
ling of double rename of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Eli
j
ah Newr
e
n
m
erge-recursive:
Move handl
i
n
g
o
f
d
o
uble rename of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive:
Avoid
doubly merging rena
m
e/add conflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
l
ijah Ne
w
ren
merge-recursive: Upda
t
e merge_co
n
tent
(
) call
signature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-re
c
ursive: U
p
date conflict_rename_rename_
1
t
o
2
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
m
e
rge-recursive: Struct
u
re process_df_entry() to handle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah
N
ewren
merge-recursiv
e
:
Have pro
c
ess_en
t
ry() skip D/F or rename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-r
e
cursive: New
f
uncti
o
n to
assist resolving renames
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
El
i
jah Newren
merge-
r
ecu
r
sive: New data structures for de
f
erri
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Newren
merge-r
e
c
ursive: Move process_entry's c
o
ntent m
e
rging
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-recursive: Move de
l
et
e
/modify han
d
li
n
g int
o
dedicated
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merg
e
-
recursive:
Mov
e
ren
a
me/de
l
ete handling
int
o
dedicated
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
merge-rec
u
rsive: Nuke rename/d
i
rectory conf
l
ict detection
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
El
i
j
ah Ne
w
r
e
n
m
erge-
r
e
cursive: Rename conflict_re
n
ame_rename*
(
) for
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
m
erge-recu
r
si
v
e: Small code c
l
arification -- variable
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah N
e
wren
t
6036:
A
dd
testcase for undetected confl
i
ct
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6036: Add a secon
d
test
c
ase similar to the first but
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6036:
Tes
t
index and w
o
rktree state, n
o
t just that
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elija
h
Ne
w
ren
t6020:
A
dd a testcas
e
for
m
o
d
ify/de
l
ete
+ direc
t
ory
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6020
:
Modernize s
t
yle a
b
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t6022
:
A
dd tests for rename/rename com
b
ined wi
t
h D
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
E
lijah Newren
t60
2
2: Add
p
aired
renam
e
+D/
F
c
o
nflict: (t
w
o/file, o
n
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newre
n
t6022: Add tests wit
h
b
oth rename
source
&
d
e
s
t
involved
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah
N
e
wren
t
6022
:
Add t
e
sts for
rever
s
ing order of merges
wh
e
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah Newren
t60
2
2: Add test combinations of {content
c
onflict?
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Elijah N
e
wren
t6
0
32: Add a test che
c
king for excessiv
e
outp
u
t f
r
om
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
J
u
n
io C Hama
n
o
merge-re
c
ursi
v
e: Restructure showing how to cha
i
n
more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
Schalk, Ken
t3030: Add a testcase
for
r
esolvable rename/add conflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-30
J
u
nio
C
Hamano
Mer
g
e branc
h
'
en/rename-d-f' into en/merg
e
-re
c
urs
i
ve
commit
|
commitdiff
|
tree
2010-09-18
Junio
C Haman
o
Git 1
.
7
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-18
Junio C
H
aman
o
Merge bran
c
h
'js/ls-files-x-doc'
commit
|
commitdiff
|
tree
2010-09-17
Chr
i
s Johnsen
g
i
t-rebase
-
-
i
nteractive
.
sh: re
p
la
c
e cut with ${v%% *}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-17
Brand
o
n Casey
t/t73
0
0: worka
r
ound ancient
t
ouch by rearra
n
ging a
r
guments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-16
Jun
i
o
C Ham
a
no
Merge branch 'bg/fix-t7003'
commit
|
commitdiff
|
tree
2010-09-16
Junio C Hamano
ls-
f
iles documenta
t
io
n
:
r
eword for
consis
t
e
n
cy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-16
Jay Soffian
git-ls-
f
il
e
s
.
t
x
t: clarify -x/-
-
exclude option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
G
i
t
1
.
7
.
3 rc2
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
Merge
b
ranch 'dr/
m
aint
-
ls-tree-prefix-r
e
curs
i
on-fix'
commit
|
commitdiff
|
tree
2010-09-15
Junio
C Hamano
Merge branc
h
'
os/fix-rebase-diff-no-prefix'
commit
|
commitdiff
|
tree
2010-09-15
J
unio C Hamano
Merge branch '
j
l/fix-test'
commit
|
commitdiff
|
tree
2010-09-15
Juni
o
C Ham
a
no
Merge branch 'ch/filter-branch
-
deprecate-
r
e
m
ap
-
to-ancestor'
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
Merge branch 'ch/maint-cann
o
t-create-bundle-error'
commit
|
commitdiff
|
tree
2010-09-15
Ju
n
io C Hamano
Mer
g
e br
a
nc
h
'k
s
/recursive-r
e
n
a
m
e-add-identical'
commit
|
commitdiff
|
tree
2010-09-15
Jun
i
o C
H
amano
Merge git:
/
/repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2010-09-13
B
r
i
an Gernhardt
t7003: Use tes
t
_co
m
mit
i
n
stea
d
of c
u
stom functi
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-12
J
unio C
Hamano
Merge
b
ranc
h
'm
a
int'
commit
|
commitdiff
|
tree
2010-09-12
J
u
nio
C
Hamano
ls
-
tre
e
$di $dir: do
n
ot mistakenly
r
ecurse i
n
to
d
irectories
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-12
Jun
i
o C H
a
mano
t
3
10
1
: modernise styl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-12
Ramsay
Jones
vcs-svn: Fi
x
some
printf
f
orm
a
t compil
e
r
w
arning
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-11
René
Scharfe
co
m
pat/nedmalloc:
don't fo
r
ce NDEBUG on
the rest of git
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Junio C Hamano
G
it 1
.
7
.
3
r
c1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Junio C Ha
m
a
no
Me
r
ge
b
r
anch 'np/relnot
e
s-in-subdir'
commit
|
commitdiff
|
tree
2010-09-10
Junio C
H
a
m
ano
Prepare for 1
.
7
.
3 r
c
1
commit
|
commitdiff
|
tree
2010-09-10
Ju
n
i
o
C Hamano
M
e
rge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-09-10
Mark Lodato
config
.
txt: fix plac
e
men
t
of diff
.
noprefix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Bra
n
don
C
a
s
ey
t/t4018: av
o
id tw
o
unn
e
cessa
r
y
s
ub-shell invocations
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Ju
n
io C
Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-09-10
Brando
n
Casey
t/t4018: te
s
t wh
e
ther the
word_regex patterns compile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Brandon Case
y
xdif
f
-interface
.
c: always tri
m
trai
l
in
g
space
f
rom
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Brandon Casey
diff
.
c:
c
all
regfree
t
o
f
r
ee memory a
l
l
ocated by
regcomp
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Brandon Casey
t/t5510-fetch
.
sh: improve test
i
ng
w
ith
e
xplicit URL
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Br
a
n
do
n
Casey
builtin/fet
c
h
.
c: comment that bra
n
c
h->remote_name is
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Bran
d
on
C
asey
Makefile: use
c
ompat
r
egex on IRI
X
6
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Brandon
Casey
t/t700
8
: workarou
n
d broken han
d
l
i
ng o
f
\00
0
by p
r
in
t
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Oded Shimon
Add --
s
rc/dst-
p
refix to git-formt
-
patch in git-rebase
.
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Elijah
Newren
merge-recursive: D/F conflicts whe
r
e
w
as_a
_
d
i
r/file
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
E
l
ijah Newre
n
t3
5
09: Add rename + D/F
con
f
lict test
c
ase that recursi
v
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
J
unio C Haman
o
i
nstal
l
-webdoc: kee
p
i
nstalled RelNo
t
es-*
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Jen
s
L
e
hmann
t
1020: Get
r
id of 'cd "$HERE"' at the start of
each
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Jo
n
ath
a
n Nieder
t20
1
6 (che
c
kout -p): add m
i
ssing
&
&
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Jonathan Nieder
t
1302 (core
.
re
p
ositoryvers
i
on): styl
e
t
w
eaks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Jon
a
t
h
an Nieder
t
2
1
05 (g
i
t
f
ile)
:
add
mi
s
sing &&
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Jon
a
than Nieder
t
1
4
50 (fsck):
r
e
mo
v
e dang
l
i
n
g
objects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Jonathan N
i
e
d
e
r
t
ests: s
u
b
s
hell indentation
stylefix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Merge branch '
t
f/cleanup-bui
l
tin-hel
p
-headers'
commit
|
commitdiff
|
tree
2010-09-08
Junio C
Haman
o
Merge branch 'jk/test
-
must-f
a
il-miss
i
n
g
'
commit
|
commitdiff
|
tree
2010-09-08
Jun
i
o C Hamano
Mer
g
e bra
n
ch 'jh/error-
r
emovi
n
g
-
miss
i
ng-note'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Merge branc
h
'kf/askpass-config'
commit
|
commitdiff
|
tree
2010-09-08
Ju
n
io C Ha
m
ano
Mer
g
e b
r
anch 'bc/maint-fe
t
ch
-
url-on
l
y'
commit
|
commitdiff
|
tree
2010-09-08
Jun
i
o C Hamano
M
e
rge
b
ranch
'
jk/maint-pa
s
s-c-config-
i
n-env
'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Haman
o
Mer
g
e
branch '
e
n/
d
-f-confli
c
t
-
fix'
commit
|
commitdiff
|
tree
2010-09-08
J
o
hannes Sixt
f
a
s
t-exp
o
rt: ensure that a ren
a
med file is p
r
inted
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-07
Nic
o
l
a
s Pitre
Docu
m
entation: move
RelNote
s
in
t
o a directory of their own
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-07
Juni
o
C Hamano
Merge
b
r
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2010-09-07
Elijah N
e
wren
r
e
ve
r
t: F
i
x trivia
l
com
m
e
nt sty
l
e issue
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-07
Elijah N
e
wren
cache_tree
_
free: Fix
smal
l
m
emory l
e
ak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-06
Junio C Hamano
Merge b
r
anch 'jh
/
c
lean-
e
xc
l
ude
'
commit
|
commitdiff
|
tree
2010-09-06
Thiag
o
F
a
r
i
n
a
builtin/c
l
ean
.
c: Use
S
TRING_LIST_INI
T
_
N
O
D
UP
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-06
J
u
nio C Hamano
Merge
b
ra
n
ch 'jl/maint-fix-tes
t
'
commit
|
commitdiff
|
tree
next