repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'gb/gitweb-opml'
2009-01-15
Mi
k
l
o
s
Vajn
a
Make t
3
411 e
x
ecutable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2009-01-03
Miklos Vajna
fast-export:
print usage whe
n
no option
s
specifie
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-30
Miklos Vajna
parse-opt:
migrate b
u
iltin-app
l
y
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-23
Miklos Vajna
t9
1
29: skip the last three tests
i
f
U
T
F
-
8
locale is
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-20
M
iklos Vajna
Submit
t
i
ngPatch
e
s: mention the
u
sag
e
of re
a
l name in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
M
i
klos Vajna
githooks documentati
o
n: add a note about the +x mode
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-17
Miklos
V
ajna
git
-
da
e
mon
documentati
o
n: use {tilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-11
Miklos
V
ajna
Add support for a
pdf
ver
s
ion of the user
m
a
nua
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklos Vajna
git-gui:
Update Hungarian translatio
n
for 0
.
12
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Mi
k
los Vajna
h
t
tp
.
c: use
'
git_config_stri
n
g'
t
o get 'curl_http_proxy'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
k
los Va
j
n
a
submodule: use
g
it rev
-
p
arse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
k
los
V
a
j
na
r
ebase: use git re
v
-
p
a
rse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
aj
n
a
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:
u
se git rev-
p
a
r
se -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos V
a
jna
f
i
lt
e
r-b
r
anch:
u
se
g
it
rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
ajn
a
g
it
-
stash: use git rev-p
a
rse -
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos Vajna
User's Manual: remove dupli
c
ated u
r
l
a
t the e
n
d of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vajn
a
builtin_clone: use strbuf in cmd_clo
n
e()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos
Va
j
na
bui
l
tin-clone
:
use strbuf in clon
e
_local(
)
and co
p
y
_or_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklo
s
Vajna
builtin-clo
n
e:
use strbuf in guess_dir_name
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos Vajna
Add new testcase to
s
how f
a
st
-
export
d
o
e
s
no
t
a
lwa
y
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
builtin-branch: use strb
u
f in re
n
ame_
b
ranch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
i
k
los
Vajna
bu
i
ltin-bra
n
ch: use strbuf in
f
ill_t
r
ac
k
ing_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklo
s
V
aj
n
a
built
i
n
-
branch:
u
se
strbuf in delete_branches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
iklo
s
Vajna
U
pdate Hungar
i
an t
r
anslation
.
100% complet
e
d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
M
i
kl
o
s Vajna
g
i
t-remote: document
t
he
migra
t
io
n
feature of the r
e
n
ame
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
M
iklo
s
V
a
jna
git-remote re
n
a
m
e: migrate from
r
emotes/ and
branches
/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Mik
l
os Vajna
re
m
ot
e
:
add a new 'o
r
ig
i
n' va
r
iable to the s
t
ruct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajna
I
mple
m
ent git
r
emote rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos
Vajn
a
u
pdate-ref
-
-no-deref -d: handle the case when the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklos Vaj
n
a
git branc
h
-m: forbid renaming of a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fix git update-ref --no
-
der
e
f -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklo
s
Vajna
r
e
n
a
m
e
_
ref(): handle the case when the reflo
g
o
f a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fix gi
t
branch -m for symrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Mikl
o
s
Vajna
parse-opt: migrate builtin-checkout-
i
ndex
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
M
i
kl
o
s Vajna
Add testcase
t
o
ensure
m
e
rging an ear
l
y part of a
branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add Li
n
ux PPC support to the p
r
e-a
u
t
o
-g
c
e
xample h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos Vajna
test-lib: fix color reset
i
n say_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Im
p
lement git clone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Cleanup in sha1_fil
e
.
c
:
:cache_or_un
p
ack_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Va
j
na
bu
i
ltin-commit: u
s
e re
d
u
c
e
_
h
ead
s
() only w
h
en a
p
prop
r
iate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos
Vajn
a
bu
i
ltin-mer
g
e: refresh the i
n
dex befor
e
calling a strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mikl
o
s Vajna
t7
6
03
:
add new t
e
stca
s
es t
o
e
n
su
r
e
b
u
iltin-com
m
it uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
builtin
-
commit: use com
m
it_t
r
ee()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
comm
i
t_tree(): ad
d
a new author
param
e
ter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t
7
501: alway
s
use te
s
t_cmp
inste
a
d of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos
V
ajna
builtin-m
e
rg
e
:
release the loc
k
file i
n
try_merge
_
stra
t
egy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recur
s
ive
:
get rid
o
f
v
i
rtu
a
l_i
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
m
er
g
e-recursive: m
o
ve c
u
r
ren
t
_{file,directory}_
s
e
t
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
me
r
ge-recursive: mo
v
e the global o
b
uf to
s
truc
t
mer
g
e_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Vajna
merge-recursive:
g
et ri
d
of
the index_only global varia
b
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklo
s
Vajna
mer
g
e-recursi
v
e: mov
e
cal
l
_depth to st
r
uct merge
_
options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mi
k
l
os Vajna
Makef
i
le
:
a
d
d merge_recursive
.
h
to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
iklos Vajna
cherry-pick/revert: make direct
internal call to merge
_
tree()
commit
|
commitdiff
|
tree
2008-08-31
M
i
k
l
os V
a
jna
builtin-me
r
ge
:
avo
i
d run_command_v_o
p
t()
f
or recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Mikl
o
s Va
j
na
merge-recur
s
ive: introduce mer
g
e_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklo
s
V
ajna
Sp
l
it out m
e
rge_recursive(
)
to merge
-
recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajn
a
Makef
i
le: en
a
ble SNPRIN
T
F_RETUR
N
S_
B
OGUS for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
F
i
x 'git help
help
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklo
s
Vajna
t
9
3
00: replace '!' wi
t
h test_must_fa
i
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
Docume
n
tation: d
o
cument
t
he pager
.
* c
o
nfiguration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vaj
n
a
Builtin git-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklo
s
Va
j
n
a
b
uilti
n
-help: alway
s
load_command_lis
t
(
)
in cmd_help(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
A
d
d a second testcase
f
or handling invalid strate
g
ies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
os Vajn
a
Add
a new test for using a custom merg
e
strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Vajn
a
b
u
i
ltin-merge: al
l
ow using a custom
s
t
r
ategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos Vaj
n
a
built
i
n-he
l
p: make som
e
inte
r
n
al f
u
nctions available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos V
a
jna
t7601: extend the 'mer
g
e picks up the
b
est
result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Va
j
na
builtin-
m
erge: give a proper error message
for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mik
l
os Vajna
Teach 'git me
r
ge' that
some merge strategies
n
o
longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos V
a
j
na
Add a new test for git-merge-reso
l
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: add a new
t
e
s
t
f
or git-merg
e
-resol
v
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make remove-dashe
s
: apply
t
o scripts an
d
programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
klos
Vajna
git-bis
e
ct: use
d
ash-less for
m
on git bisect lo
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
o
s Vajna
t100
7
-has
h
-object
.
sh:
u
s
e
q
u
o
tes
f
o
r
the test description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
na
t0001-init
.
sh: change confusing directory n
a
me
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
B
uild in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s Vajn
a
Fi
x
t7601-merge-pull-conf
i
g
.
sh on
AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
ajna
g
it-commit-tree:
m
ake i
t
usa
b
le from other buil
t
ins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklo
s
Va
j
na
Add
n
e
w
tes
t
c
a
s
e t
o
e
n
s
u
r
e git-merge
prep
e
nds the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vajna
hg-to
-
g
i
t: use
g
i
t
i
n
it
i
ns
t
ead
of git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os Va
j
n
a
hg-to
-
git: rewrite "git
-
f
rotz
"
to "gi
t
frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os Vajna
hg-to-
g
it: abort if th
e
project dire
c
tory
is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg
-
t
o
-git
:
avoid raising a string exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os Vajna
INS
T
AL
L
: Update section abo
u
t gi
t
-fro
t
z
f
orm
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
M
iklo
s
Vajna
Retire 'stupid' merge strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
A
d
d new test case to ensure gi
t
-merge reduces octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
d
d new t
e
st to ensure git
-
merge handles more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Introduce get_octop
u
s_m
e
rge_bas
e
s(
)
in c
o
mmit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
g
i
t-fmt-merge-msg: make
it usa
b
le
from other
builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Move
r
e
ad_cache_unm
e
rged() to read-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test
t
o ens
u
re git-m
e
rge handl
e
s p
u
ll
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
a
jna
M
o
ve parse-options's
s
k
ip_prefix()
to git-compat-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Move commit
_
list_co
u
nt() to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Va
j
na
Move split
_
cmdline()
to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
path-
l
ist
doc
u
mentation: document all funct
i
ons and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklo
s
Vajna
r
un-comman
d
doc
u
mentatio
n
: fi
x
"memset()
"
parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklo
s
Vajna
g
i
t-
r
e
a
d
-
tree
:
d
o
cument -v opti
o
n
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A
simple scri
p
t
t
o
parse the r
e
su
l
ts from the testcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
iklos Vajn
a
git-r
e
base -i: mention the sh
o
rt command alia
s
es in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next