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 'mh/cherry-default'
2009-01-03
Miklos
Vajna
fast-exp
o
rt: print
u
sage when no opt
i
ons sp
e
c
i
fie
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklos V
a
jna
t9129: skip the
l
ast three tests
i
f
UTF-8 lo
c
ale is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
Mi
k
los Vajna
SubmittingPa
t
ches: ment
i
on the usage
o
f
re
a
l name in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
githooks
d
oc
u
m
entation: ad
d
a
n
o
te about the +
x
mod
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
g
it-daemo
n
documentation: u
s
e
{
t
ilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Miklo
s
Vajna
Add support for a
p
df
v
ersion of the us
e
r manua
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Mi
k
los
V
ajna
git-gui: Update
H
ungaria
n
translatio
n
for 0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vaj
n
a
http
.
c: us
e
'
git_config_string' to get 'curl_
h
ttp_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s Vajna
s
u
bmodule: use
g
i
t r
e
v-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
a
jna
rebase:
u
s
e git rev-
p
arse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
klos Vajna
p
u
l
l: use git
r
e
v
-
p
a
rse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vaj
n
a
lost-
f
ound:
use git rev-pars
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
ajn
a
filt
e
r-branch: use g
i
t rev-parse
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
git
-
stash: u
s
e
g
it rev-
p
arse
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Mik
l
os
Vaj
n
a
User's Manual: remov
e
dup
l
icated url at
the
e
nd of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajn
a
b
uiltin_cl
o
ne: use
s
trbuf in cmd_clone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Va
j
na
builtin-clone: use st
r
buf
i
n clon
e
_local()
and cop
y
_or_l
i
nk_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajna
bui
l
tin-clone: u
s
e
st
r
buf in guess_dir_name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos Vajna
A
d
d
new
t
estcase to show
fast-e
x
port doe
s
not always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mik
l
os Vajna
built
i
n-branch: use strbuf in rename
_
b
r
an
c
h
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
i
klos Vajna
builtin-bra
n
ch:
use strb
u
f in fill_track
i
ng_in
f
o
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
builtin-branch: use s
t
rbuf i
n
delete_branches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
i
k
lo
s
Vajna
U
pdate Hunga
r
ian tran
s
lati
o
n
.
1
0
0% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajn
a
git-remote: d
o
cumen
t
the m
i
gration
f
eature
of the
rename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
g
it-r
e
mote rena
m
e:
m
i
grate from remotes/ and branches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos Vaj
n
a
remo
t
e: a
d
d a new
'or
i
gin
'
variable to
t
he struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vaj
n
a
Imp
l
e
me
n
t git remote rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Vajna
update
-
r
e
f --
n
o-deref
-
d
: handle
t
he case w
h
en the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
M
i
k
los V
a
jna
git br
a
nch -
m
:
f
o
r
bid ren
a
ming of
a
symr
e
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mi
k
l
o
s Vajna
Fix
g
it
update-ref --no-deref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
r
ename_ref(): handle the case when the reflog of a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
iklos Vajn
a
Fix git branch -m
f
or
s
ymrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Mi
k
los
Vajna
parse-opt: migra
t
e
bu
i
l
tin-checkout-index
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos V
a
jna
Add
t
estcase to
ensure merg
i
ng an
early part
o
f a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mik
l
os Vajna
Add Linu
x
PPC su
p
p
o
rt to
th
e
pre-
a
uto-
g
c
e
xampl
e
hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos Vajna
test-lib: fix color reset in say_
c
olor()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
i
klos
Va
j
na
Implement
g
it clone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
C
le
a
nup in sha1_fil
e
.
c::cache
_
or
_
un
p
a
c
k_
e
ntr
y
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Mi
k
los Vajna
bu
i
ltin-commit
:
use redu
c
e_he
a
ds() only when app
r
opriat
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
M
i
klos Vajna
b
u
iltin-merge:
r
efr
e
s
h the inde
x
before cal
l
ing a strateg
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mi
k
los Vajna
t7603:
a
dd new
testcases to ensur
e
bu
i
lt
i
n-co
m
mit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mi
k
los Vajna
buil
t
in-c
o
m
m
it: use commit_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
k
los Vajna
c
o
m
mit_tre
e
():
add a new au
t
ho
r
par
a
meter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
iklos V
a
jn
a
t
7
5
01: alway
s
use test_cmp
i
nstea
d
of d
i
ff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vajna
bui
l
ti
n
-me
r
ge: re
l
ea
s
e the lockfil
e
i
n
try_merge
_
strategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
me
r
ge
-
recursive: get r
i
d of virt
u
al_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Va
j
na
m
e
r
ge-recursive: mo
v
e current
_
{file,directory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos
V
ajna
m
e
r
ge-recurs
i
ve: move the
global obuf to st
r
uct merge
_
o
ption
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
o
s Vajna
merg
e
-
r
e
c
u
r
sive
:
get
r
id of
the i
n
d
ex_only global
v
aria
b
le
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
merge-recursi
v
e: move
call
_
depth to struct merge_optio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajn
a
Makefile: add merge_recursive
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
ikl
o
s Vajna
c
h
erry-pic
k
/revert: make direct internal call to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
M
i
klos Vajna
builtin-merge: avoid ru
n
_
c
ommand_v_opt() fo
r
recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
V
ajn
a
merge-recur
s
ive: i
n
trod
u
ce m
e
rge_
o
ptions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
Vajna
Sp
l
i
t out merge_recursive()
t
o merge-
r
ecursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos
V
ajna
Makefile: e
n
ab
l
e SNPRI
N
TF_RETURNS_BOGUS for HP-
U
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Mi
k
lo
s
Vajna
Fix 'git help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Mik
l
os
Vajn
a
t9300: replace '!' wi
t
h test_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Va
j
na
Documentation: document the
p
age
r
.
* configuratio
n
setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vajna
Builtin
g
it-
h
elp
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
M
iklos Vaj
n
a
bui
l
tin-help: always load_command_list() in cmd_h
e
lp()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
o
s
Vajna
Add a second testcase
for handlin
g
invalid s
t
rategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vaj
n
a
Add a new test for using a c
u
stom merge
strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
V
ajna
builtin-m
e
rge: allow using a custom strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
Vajna
bui
l
tin-
h
elp: m
a
ke
s
ome internal functions available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos V
a
jna
t7601: ex
t
end the 'mer
g
e
picks up the be
s
t
result
'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklo
s
Vajna
builtin-merge: give a proper
error mess
a
ge
for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mi
k
los
Vajna
Teach 'git merge' that some merg
e
strateg
i
es no
longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
M
i
kl
o
s
Vajna
Add a new test for git-
m
erge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t
60
2
1
: add a n
e
w
test for git
-
m
e
rge-re
s
olv
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Vajna
make
remove-dashes: apply to scrip
t
s an
d
programs
as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bisect: u
s
e dash-less form on git bis
e
ct log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Vajna
t1007-hash-
o
b
j
ect
.
sh: use quotes for the te
s
t description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Vajna
t0001
-
init
.
sh: change
confusin
g
dir
e
ctory n
a
me
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Build
i
n merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos V
a
jna
Fix t7601-merge-pull-con
f
ig
.
sh o
n
AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klo
s
Vajna
git-
c
o
mmit
-
t
r
ee: make it usabl
e
f
r
o
m other bui
l
tins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
iklos Vajna
Add
new test ca
s
e to ensure git-me
r
ge prepends t
h
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
ikl
o
s V
a
jna
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 Vajn
a
hg-to-g
i
t
: rewrite "g
i
t-fro
t
z" to
"
git
frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
h
g
-to-git
:
ab
o
rt if the pr
o
ject d
i
re
c
t
o
ry is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
a
j
na
h
g
-
t
o-git: avoid raising
a strin
g
excep
t
ion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INSTA
L
L: U
p
d
a
te section about gi
t
-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
M
i
kl
o
s Vajna
Ret
i
re 's
t
upid' merge strat
e
gy
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Add new test
c
as
e
to ensure git-mer
g
e reduces octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Add new t
e
st to
e
nsure git-me
r
ge
h
andles more
than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Intr
o
d
uce get_octopus_merge_bases(
)
in
commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-fmt-merge-msg:
m
a
k
e
it usable from other
bu
i
ltins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos
V
ajn
a
M
o
ve read_cache_unmerg
e
d
()
t
o
read-cac
h
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klo
s
Vajna
Add new
t
est to ensure git
-
m
e
rge ha
n
dle
s
pull
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
ik
l
os Vaj
n
a
Move pa
r
se-options's skip_prefix() to gi
t
-comp
a
t-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
M
o
v
e
commit_list_count() to commi
t
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Move sp
l
i
t_cmdline() to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Va
j
na
path
-
list documentation: document al
l
functions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajn
a
run-com
m
and
d
ocu
m
entat
i
on
:
fix "memset()" paramete
r
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git
-
read
-
t
ree: document -v opt
i
o
n
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
k
los
V
ajna
A sim
p
le script to p
a
rse
t
h
e results from the testcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos Vajna
git-rebase -i:
mention the short co
m
mand alia
s
es in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
Vajna
Re
m
ove unused
c
o
de in parse_c
o
mmit_buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
Strbuf documen
t
ation:
d
ocument m
o
s
t
f
unctio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next