repo.or.cz
/
git
/
trast.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint-1.6.0' into maint
2009-01-15
Mikl
o
s Vajn
a
M
ake t341
1
executable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos Vajna
f
a
st
-
export: pr
i
n
t us
a
ge when n
o
o
ptions s
p
ec
i
fied
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Mik
l
o
s
Vajn
a
t9129:
s
kip the last
t
hree tests if UTF-8 l
o
c
a
l
e is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Mik
l
os
Va
j
na
SubmittingPatches: me
n
tion
t
he
u
s
age
o
f real
n
ame in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Mi
k
los Vajna
g
i
th
o
o
ks document
a
tion: add a n
o
te abo
u
t the
+
x
mo
d
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vaj
n
a
git-daemon do
c
umentatio
n
:
use {tilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklos V
a
j
na
g
i
t-gui: Update Hun
g
aria
n
transl
a
ti
o
n for 0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
M
iklos
V
ajna
http
.
c: u
s
e 'git_con
f
ig_
s
t
r
ing' to get 'curl_
h
ttp_pro
x
y'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
submodule:
use git r
e
v-parse
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
a
jna
r
eb
a
s
e
: use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
ajna
pull: use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
lost-fou
n
d
:
use git r
e
v-par
s
e -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
V
a
j
na
filter-branch: use
git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
gi
t
-stash: use git r
e
v-p
a
rse
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos Vajn
a
U
s
er's Manu
a
l: remove dupli
c
a
ted url at th
e
e
nd
of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vaj
n
a
builti
n
_clo
n
e: use strbuf i
n
cm
d
_clo
n
e()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajn
a
builtin-clone:
u
se strbuf in clone_lo
c
al() and copy_
o
r_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Mi
k
los Vajna
bui
l
tin-clone: use str
b
u
f
in guess_
d
ir_name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos
V
ajna
Add
ne
w
testcase t
o
show fast-export
d
o
es not always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
i
klos Vajna
builtin-
b
ra
n
ch: use strbuf in ren
a
me_bra
n
ch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos
Vajna
builtin-bran
c
h: use strb
u
f in
f
ill_tr
a
cki
n
g_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Va
j
na
builtin-branch: use strbuf i
n
delete_bran
c
hes()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mikl
o
s Vajna
U
p
d
ate Hungarian t
r
anslat
i
on
.
100% comple
t
e
d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-rem
o
te: document the m
i
grati
o
n feat
u
re of the rename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vaj
n
a
g
i
t-r
e
mote
rename:
m
igrate from re
m
otes/ and branches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklo
s
Va
j
na
r
emote: a
d
d a new
'
orig
i
n
'
vari
a
ble to the s
t
r
u
ct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Mik
l
o
s
Vajna
I
mplement
g
it remo
t
e rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
M
i
k
l
os V
a
jna
u
p
date-ref --no-deref -d: h
a
n
d
le the cas
e
when the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Mik
l
os Vajna
git branch -m: forbid renaming o
f
a
sy
m
re
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fix git
updat
e
-ref --no-deref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
ikl
o
s Vaj
n
a
rename_ref(): handle th
e
case
when
the re
f
log o
f
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mik
l
os Vajna
Fix git branch -m for symrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Vajna
pa
r
s
e
-opt:
migrate b
u
il
t
in-c
h
ecko
u
t
-
ind
e
x
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mik
l
o
s
Vajna
Add testcase to
e
nsure merging
an
early part of a
b
r
a
nch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
A
dd Linux PPC sup
p
or
t
to
the pre-auto-gc ex
a
mple hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklo
s
Vajna
t
est-lib: fix
colo
r
reset
in
say_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklo
s
Vajna
Im
p
lement gi
t
clone -
v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos
Vajna
Cl
e
anup in sha1_fi
l
e
.
c
:
:c
a
che_or
_
unpack_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos
V
a
jna
builtin-commit: use reduce_heads()
only when app
r
opria
t
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Mi
k
los Vajna
bu
i
ltin-
m
erge: ref
r
e
sh
the
index be
f
ore calling
a st
r
at
e
g
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7603: add ne
w
t
estcases to
e
nsure builtin-comm
i
t uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mik
l
os Vajna
bui
l
tin-commi
t
:
use commit_tree(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
Va
j
na
commit_tree(): add a
new autho
r
pa
r
ame
t
er
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7501: always u
s
e test
_
c
m
p i
n
stead of
diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos V
a
jna
b
u
iltin-
m
erge: re
l
ease th
e
lockfile in try_
m
erge
_
strategy
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklo
s
Vajna
merge-recur
s
ive: get rid of virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merg
e
-recursive: move
c
urrent_{file,direct
o
ry}_se
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vaj
n
a
merge-re
c
ursive: move the global
obuf to st
r
uct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Va
j
n
a
merge-recursive: get rid of the index_only global variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
M
iklos
Vajna
merge-recursi
v
e
:
mo
v
e call_dep
t
h to struct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
Ma
k
efile: add
m
erge_recu
r
s
ive
.
h
to LI
B
_
H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos V
a
jna
che
r
ry-pick
/
r
evert: make dire
c
t inte
r
nal c
a
ll to merge_t
r
ee()
commit
|
commitdiff
|
tree
2008-08-31
Mikl
o
s Vajna
bu
i
ltin-merge: avoid run_command_v_opt() for re
c
ursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
merge-rec
u
rsive: introduce m
e
r
g
e_optio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
M
i
k
los Vajna
Split out m
e
rge_recursive() to merge
-
r
e
cursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Mik
l
os Vajna
Makefi
l
e: enable SNPRINT
F
_RETURNS_BOGUS f
o
r HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklo
s
Vajna
Fix 'git
help
h
elp'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos
V
aj
n
a
t9300: repla
c
e '!' wit
h
test_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Mik
l
os Vajna
D
o
c
umentation: d
o
c
ument
t
he pager
.
*
c
onfiguration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
M
i
k
los Vajna
Built
i
n git
-
he
l
p
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajn
a
bu
i
ltin-help:
a
l
w
a
ys load_command
_
list() in cmd_h
e
lp()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
k
los
V
a
j
na
Add a
s
e
c
ond
t
es
t
c
a
se
f
o
r
handling inval
i
d strategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Ad
d
a
new tes
t
for using
a custom mer
g
e
strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
ikl
o
s
Vajna
builtin-
m
erge: allo
w
using a c
u
stom strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mikl
o
s Vaj
n
a
bui
l
tin-help: make
some internal functions
a
v
a
il
a
ble
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
M
i
klos Vajna
t7601: extend the 'm
e
r
g
e
p
icks up
th
e
best result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
bui
l
tin-merge:
give a prop
e
r error message for inv
a
lid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Tea
c
h 'gi
t
mer
g
e'
that some merge strategies
no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklo
s
Vajna
Add a
new tes
t
for git-merge-reso
l
ve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklo
s
Vajna
t6021: add a
n
ew t
e
st fo
r
gi
t
-me
r
ge-re
s
o
lve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Vajna
make remove-d
a
s
hes: apply to scripts and
programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
V
ajna
g
i
t-bisect:
u
se d
a
sh-l
e
ss form on gi
t
bis
e
c
t
log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos Vajna
t1007-hash-object
.
sh:
use q
u
otes
f
o
r t
h
e tes
t
descriptio
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-init
.
sh: chan
g
e conf
u
sing direc
t
ory
name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Va
j
na
Build in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos Vajna
Fix
t
7601-merge-pull-config
.
sh on AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
g
it-commit-tree
:
make it
u
sa
b
l
e
f
rom ot
h
er buil
t
ins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos
V
ajna
Add new
t
est
case to ensure git-merge prepends
t
he
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: us
e
git init instead of
git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vaj
n
a
hg-to-git: r
e
write "git-fr
o
t
z
"
to
"
git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos
V
ajna
hg-to-git:
a
bort if
the project director
y
is
not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajna
h
g-to-git: avoid raising a st
r
i
n
g exc
e
ption
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
I
NSTA
L
L
:
Update section about
git-frotz
for
m
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Retire '
s
t
u
pid' mer
g
e strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
Add ne
w
test case to ensur
e
git-merge re
d
uces
o
ctopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vaj
n
a
Add ne
w
test t
o
ens
u
re git-merge handles more tha
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajn
a
Introduce get_octo
p
us_
m
e
rge_bas
e
s
(
) in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
ik
l
os Vajna
g
it
-
f
mt-merge-msg: make
i
t
u
s
able from other
bu
i
l
t
i
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
o
s Vajn
a
Move
r
e
ad_c
a
c
h
e
_unme
r
ged() to read-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos
Vajna
Add ne
w
t
est to
e
n
sure git-
m
erge handle
s
pull
.
tw
o
head
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
M
ov
e
parse-opt
i
on
s
's skip_p
r
e
f
ix() to git-compat-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Mov
e
c
ommit_list
_
count() to
c
ommit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
Move split_cmdline() t
o
alia
s
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
p
a
th-list documentation:
d
ocument a
l
l functio
n
s an
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
M
i
k
l
os Va
j
n
a
run-comm
a
nd documentation: fix "mems
e
t()" parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos
V
a
jna
git-read-tree: docu
m
ent -v opt
i
on
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A simple
script to
p
arse
t
he result
s
from
t
he te
s
t
c
ases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
ajna
git-r
e
bas
e
-
i
:
m
entio
n
the
short comman
d
aliases i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
k
los
Vajna
Remove un
u
sed code in p
a
rse_commit_buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
S
trbuf documen
t
ation: document
m
ost functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next