repo.or.cz
/
git
/
dscho.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/maint-co-track'
2008-10-14
M
i
klos Vajna
Add test
c
a
s
e to ensure
m
erging
an early
p
a
r
t of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mikl
o
s Vajna
Add Linux PP
C
support to the pre-a
u
to-
g
c e
x
ample hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos V
a
jna
test-lib: fix
c
olor reset
i
n s
a
y_co
l
or()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Mikl
o
s Vajna
Implement git clone
-v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
i
klos Va
j
na
Cleanup in sha1_fil
e
.
c::cach
e
_or_unpack_e
n
try()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builti
n
-commit: use reduce_heads() onl
y
when appropriate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklo
s
Vajna
builti
n
-merge: ref
r
esh t
h
e
index bef
o
r
e
calling a
s
tr
a
t
egy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos V
a
jn
a
t760
3
: add new tes
t
cas
e
s to ensu
r
e
b
uiltin-com
m
i
t
u
s
es
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
klos Vajna
b
u
iltin-comm
i
t: use
c
ommit_tre
e
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
c
om
m
it_tree(): ad
d
a
new au
t
hor
p
aramete
r
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7501: always use test_cm
p
i
n
stead
of
di
f
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos V
a
j
n
a
builtin-merge: release the lockfile in try_merge_st
r
ategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
klos Va
j
na
merge-r
e
cursive: get rid of vir
t
ual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
k
l
os Vajna
merge
-
recu
r
sive: move current_{file,dir
e
ctory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s V
a
jna
me
r
ge-rec
u
rsive: move
t
h
e
globa
l
obuf to struct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recursi
v
e:
g
et rid of the index_only
g
lobal variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
mer
g
e-recursive: move
c
all_depth to struct
merg
e
_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
Makefile: ad
d
merge
_
r
ecursi
v
e
.
h to LI
B
_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vaj
n
a
cherry-pick/revert: make
dire
c
t interna
l
call to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos V
a
jna
b
u
ilti
n
-merge: a
v
o
id run
_
command_v_o
p
t() fo
r
recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
merge-recursi
v
e: i
n
t
r
oduc
e
merg
e
_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vaj
n
a
Split out merge_recursiv
e
() to
merge-
r
ecursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
M
i
k
l
os V
a
jna
Makefile
:
enab
l
e SNPR
I
N
T
F_RETURNS_BOG
U
S for
HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vaj
n
a
Fix 'git
h
el
p
help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t9
3
00: replace
'
!' with
te
s
t_mu
s
t_fa
i
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Documentat
i
o
n: document
the page
r
.
* configuration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
M
iklos Va
j
na
Builtin git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
M
iklos Vajna
builtin
-
hel
p
:
a
l
ways l
o
ad_co
m
mand
_
list() in cmd_hel
p
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
A
d
d a second testcase for ha
n
dling
invalid st
r
ategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os Va
j
na
Add a new test for using a custom
merge strat
e
gy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos
V
a
jna
bui
l
tin-me
r
ge: allow us
i
n
g
a custo
m
strateg
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos V
a
jna
b
u
iltin-help: make some int
e
rnal functi
o
ns available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklo
s
Vajna
t
7
6
01: extend
t
he 'merge p
i
cks up the b
e
st res
u
lt'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Va
j
na
bui
l
tin-merge: g
i
ve a prope
r
error message for inva
l
id
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklo
s
V
ajna
T
e
ach 'g
i
t merge' that so
m
e merge strat
e
g
i
es
n
o longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
klos Va
j
n
a
A
dd a new test fo
r
git-
m
erg
e
-
resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
l
o
s
V
ajna
t6021: add
a
ne
w
tes
t
for git-merge-r
e
s
olve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make remove-dashes:
a
pply
to scripts an
d
pr
o
g
rams
a
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
gi
t
-bisect: use
d
as
h
-
l
ess fo
r
m on git bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-hash-objec
t
.
sh: use quotes for the t
e
st descripti
o
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Va
j
n
a
t
0
0
01-init
.
sh: cha
n
ge co
n
fusing directory
name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Mi
k
los Vajna
Build in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os Vaj
n
a
Fix t7601-m
e
rge-pull-c
o
n
f
i
g
.
sh
o
n AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos
Vajna
g
it-comm
i
t-tree:
m
ake it u
s
able from other
b
u
i
ltins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos V
a
jn
a
Add new
t
est ca
s
e to ensure git-m
e
rg
e
p
r
epends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
h
g-t
o
-
g
it: u
s
e
g
it in
i
t instead of git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os Vajna
hg-to-g
i
t: re
w
rite
"git
-
f
r
o
tz" to
"git
f
rotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: abort
if the project directory
is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vaj
n
a
hg
-
t
o
-
g
it: avoid rais
i
ng a string exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INSTALL: Update section
about git-frotz fo
r
m
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos
V
ajna
Retire 'stupid' merge str
a
tegy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test case
to e
n
sure git-mer
g
e
r
educes
octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Add new test to ensure
git-mer
g
e
h
andles more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Int
r
oduce get_octopus
_
m
e
rge_
b
as
e
s()
in
commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos
V
a
j
na
git-
f
mt-m
e
r
ge
-
msg: make it u
s
able from
o
ther builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Move read
_
cache_unmerged() to read-cac
h
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s
V
a
j
na
A
d
d
new test to
e
nsure git-mer
g
e
h
andles pull
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Va
j
na
Move
p
ars
e
-
options
'
s skip_prefix() to
g
it-co
m
pat
-
util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
Move
commit_list_count() to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Move split_cmdline()
to a
l
ias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
path-list doc
u
mentati
o
n: do
c
ume
n
t a
l
l functions an
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mik
l
o
s Vajna
run-c
o
mmand documentation: fix "
m
emset()"
parame
t
e
r
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-read-tree: document -v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mikl
o
s
Vajna
A simp
l
e
script to p
a
rse the
r
esults from th
e
testcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos V
a
jna
g
i
t
-
r
e
b
ase -i: mention the short comman
d
ali
a
ses
in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
Vajna
Remove unu
s
ed c
o
de
in
p
arse_commit_buf
f
er()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
S
t
rbuf d
o
cumentation: document m
o
st functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklo
s
Vajn
a
R
evision wa
l
kin
g
do
c
ume
n
tation: docum
e
nt most import
a
nt
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajna
Codin
g
Guid
e
lines: Add a note to avoid assignme
n
ts
inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
g
i
t-m
e
rge:
excl
u
de unnec
e
ssary options from OPTIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Mi
k
los Vajna
git-fast-imp
o
rt: rename cmd_
*
() f
u
nctions to pa
r
s
e
_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklo
s
Vajna
INSTALL: add a note about G
N
U
i
nt
e
ractiv
e
tools
has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
ikl
o
s Vajna
Add tests for sendema
i
l
.
cc configurati
o
n variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-sen
d
-email: add a new sendemail
.
c
c
configur
a
t
i
on
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
g
i
t-forma
t
-patc
h
: add a new format
.
cc configurat
i
on
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
M
i
k
l
os
Vajna
git ch
e
ckout: add
-t
a
lia
s
for --track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Mi
k
los
V
ajna
dif
f
opti
o
ns doc
u
mentation: ref
e
r to --diff-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
o
s
V
ajna
contr
i
b/hooks
:
a
dd
an example pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
D
o
cumenta
t
i
o
n/hooks: add pre
-
aut
o
-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mikl
o
s Vajna
git-gc --auto: add pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vaj
n
a
Documentation/gi
t
-merge: document
subtree strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
M
ik
l
o
s Vaj
n
a
g
i
t-gui: Updated
H
u
ngarian transla
t
ion (e
5
f
b
a
1
8)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
Update
Hungarian translati
o
n
.
100% c
o
mpleted
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
Improve t6
0
29 to
check
the re
a
l "subtree
"
case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
M
iklos
V
aj
n
a
D
o
cumentation/gi
t
svn log:
add a not
e
a
b
out timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Mikl
o
s
V
ajna
D
o
cumentation/git-f
i
lter-branch:
add a new
m
sg-fi
l
ter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git-cle
a
n:
handle errors if
removi
n
g files fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
M
iklos Vajna
D
o
cumenta
t
ion/g
i
t
-
s
t
ash: d
o
cument option
s
for
gi
t
stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklo
s
Vajna
g
it clone -s
documentation: force
a
new paragrap
h
for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
M
i
klo
s
Vajna
bu
i
ltin-gc
.
c: guard config parser
f
r
o
m value=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Mi
k
lo
s
Vajna
git rev-
p
arse
m
anp
a
ge: s
p
elling fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Mi
k
los Vajna
git pull man
p
age: don't
i
n
clude -n f
r
om fetch-opti
o
ns
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
M
i
kl
o
s Vajna
git-clone -s
:
document pr
o
blems with git gc --prune
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Mikl
o
s V
a
jna
I
nclude rev-l
i
st o
p
tions
i
n git-log manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls-
r
emote:
a
dd
-
t and -h options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklo
s
Vajna
Add using merge subtre
e
H
o
w-To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajn
a
t/t7001
:
avoid unnecessa
r
y ERE when using g
r
ep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Va
j
na
g
i
t-sh-setup: document git_editor() and get_author_ident_fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Mi
k
los Vaj
n
a
everyday: r
e
place 'prune' and '
r
epac
k
' with 'g
c
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Updat
e
Hungarian translatio
n
.
100% co
m
pl
e
ted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next