repo.or.cz
/
git
/
vmiklos.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
fast-export: print usage when no options specified
2009-01-03
Mi
k
los Vajna
fast-export: print usage wh
e
n
no options specif
i
ed
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-23
Miklos
V
ajna
t
9129: skip
t
h
e last three tests if UTF-8
locale i
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vajna
Submit
t
ingPat
c
h
e
s
: mention the usage of real name in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Va
j
n
a
githo
o
ks doc
u
mentation:
a
dd
a note about t
h
e +x
mode
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-17
Mikl
o
s Va
j
n
a
git
-
daemon doc
u
mentation: us
e
{tilde}
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-10
Miklos Vajn
a
git-
g
ui: Update Hungaria
n
translation fo
r
0
.
12
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vajna
htt
p
.
c: use 'git_con
f
i
g
_string' to get '
c
url_http_proxy
'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vaj
n
a
submodule: use g
i
t re
v
-parse
-q
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
reb
a
se:
u
se
g
it rev-parse -q
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
los Vajna
pull: u
s
e
g
i
t r
e
v-parse -
q
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os Vajna
lost
-
found: use git rev-pars
e
-
q
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os Vajna
f
i
lter-bra
n
ch: use git re
v
-
pars
e
-q
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os Vajn
a
git-stash: u
s
e
g
i
t
rev-pa
r
se -q
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-12-02
Mi
k
los Vajna
User's Manu
a
l: remove dupl
i
cat
e
d
u
rl at the e
n
d of
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-25
M
iklos Vajna
builtin_clo
n
e: u
s
e strbu
f
in cmd_cl
o
ne()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-25
M
iklo
s
Vajna
bui
l
ti
n
-clone:
u
s
e
strbuf in
clone_
l
oc
a
l() and cop
y
_or_link_
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-25
M
i
klos Va
j
na
builtin-clone:
use
s
t
rbuf in guess_dir
_
na
m
e
()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-24
M
i
klo
s
Vajna
A
d
d
new test
c
a
s
e
to sho
w
fast-export
d
o
e
s
n
ot always
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
builtin
-
bra
n
c
h: use strbuf
in rename_bran
c
h()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
b
uiltin-branch: use strbuf in fill_tracking_inf
o
()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-18
Miklos
Vajna
b
u
ilt
i
n-b
r
a
n
ch
:
use s
t
r
b
uf in delete_branc
h
es()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
U
p
date Hungari
a
n
trans
l
at
i
on
.
100% complet
e
d
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-12
M
iklos
Vaj
n
a
git-remote: do
c
ument the mi
g
ra
t
i
o
n featu
r
e of t
h
e ren
a
me
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-remote rename: migrate from remotes/
and bran
c
hes
/
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-11
M
iklos Va
j
na
remote:
add
a
new '
o
rig
i
n' varia
b
le to the st
r
uct
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-05
Mikl
o
s Vajna
Implement git remote re
n
ame
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-01
Miklos Vajna
update-ref --no
-
deref
-d: handle th
e
case when the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-30
Miklos V
a
jna
g
i
t
b
ranch -
m
: forbi
d
renam
i
ng of
a symre
f
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
F
i
x
g
it upda
t
e-ref --no-deref -d
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Miklo
s
Vajna
r
e
name
_
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
g
it b
r
anch -m for symr
e
fs
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-19
M
i
k
los Vajna
parse-opt: migr
a
te buil
t
in-checkout-index
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-14
M
i
klos Vajna
Add testcase to
e
nsure merging an ea
r
ly part of
a br
a
n
ch
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Va
j
na
Add Linux PPC support to the pre-aut
o
-gc
e
xamp
l
e hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-10
M
i
klo
s
Vaj
n
a
test-lib: fix
color re
s
et
i
n say_co
l
o
r()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Implem
e
nt git clone -v
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-09
M
iklos Va
j
na
C
le
a
nup in sha1_fi
l
e
.
c
:
:c
a
che_or_unpack_
e
n
tr
y
()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-03
Miklos
V
ajna
builtin-co
m
mi
t
: use reduce_
h
eads()
o
n
l
y when a
p
propria
t
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builtin-merge: refresh t
h
e
index be
f
ore
calling a s
t
rategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Va
j
na
t
7
603: add new testcases to e
n
sure
builtin-commit us
e
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Mik
l
os Vajna
builti
n
-commit:
u
se c
o
mmit
_
tree()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
Vajna
c
o
mmit
_
tree():
add a
n
e
w
author parameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
M
i
klos V
a
jna
t7501: always
u
se t
e
st_cm
p
instead of diff
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vajna
bu
i
ltin-mer
g
e:
release
the lockfile in try_merge_strategy()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
m
e
rge-recursi
v
e: get r
i
d of v
i
rt
u
al_id
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Va
j
na
merge-r
e
cursive: mov
e
c
ur
r
e
nt_{fi
l
e,dir
e
ctory}_se
t
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
os Va
j
n
a
merge-recursive: m
o
ve the global obuf to
str
u
ct me
r
g
e
_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recurs
i
ve: get
rid of the index_only
global variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajna
merge-recursive: move c
a
l
l_
d
ep
t
h to struct m
e
rge
_
options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Miklo
s
Vajna
Makefile
:
add merge_recursi
v
e
.
h to LIB_H
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vaj
n
a
che
r
ry-pick/revert:
m
ake direct internal call to me
r
ge_
t
ree(
)
commit
|
commitdiff
|
tree
2008-08-31
M
iklos Vajna
bu
i
ltin-merge:
a
void run_command_v_opt()
for recursive
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
M
iklos Vajna
m
erge-recursive: introduce m
e
rge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
os V
a
jna
Split
out merge_r
e
c
ursiv
e
() to merge-recurs
i
ve
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Mik
l
os Vajna
M
a
k
e
file: en
a
ble SNPR
I
NTF_RE
T
U
R
NS_BOGUS for
HP-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vaj
n
a
F
i
x 'git help help
'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t9300: replace '!'
w
ith
test_m
u
s
t_fail
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
M
i
klos
Vajna
Document
a
tion:
do
c
ument th
e
p
a
g
e
r
.
* configuration setting
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vajna
Builtin git-help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Mikl
o
s Vajna
bu
i
ltin-help: always load_comm
a
nd_
l
i
s
t() in
c
md
_
help()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Vajna
Add a s
e
cond
t
estcase
f
or h
a
ndli
n
g i
n
valid strategies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add
a new test for
using
a cus
t
om merge str
a
teg
y
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin-
m
erge: allow usi
n
g a custom
st
r
a
tegy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
b
u
iltin-help: mak
e
some internal
f
un
c
t
ions
ava
i
lable
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
M
i
klos Vajna
t76
0
1: e
x
tend the 'merge
picks up the best result'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
M
iklos Vajna
builti
n
-merg
e
: give
a proper error message
f
or invalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Mik
l
os Vajna
Teach
'
git m
e
rge' that some m
e
rge strategies no longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
M
iklos V
a
jna
Add a new test for git-merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: add a new
t
est for git-mer
g
e-r
e
solve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make remove-da
s
hes: apply to scripts and
programs as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bise
c
t: use
d
ash-les
s
form on git bise
c
t log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1
0
07-hash-object
.
sh: u
s
e quot
e
s for the te
s
t description
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vaj
n
a
t0
0
01-init
.
sh:
c
hang
e
confu
s
ing d
i
rect
o
ry nam
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
M
i
klos
V
a
jna
B
u
i
ld in
m
erge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os Vajna
Fi
x
t7601-me
r
g
e-pull-config
.
sh on
A
IX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s
V
a
j
na
gi
t
-
c
ommit-
t
ree: make it usable f
r
om other
b
uiltins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
M
i
k
l
os Vajna
Ad
d
new test ca
s
e to ensure git
-
merge
prepends the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-
g
it: use git init instead of
g
i
t init-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klo
s
Vajna
h
g
-to
-
git: re
w
ri
t
e "g
i
t-fr
o
tz" t
o
"git frotz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
V
ajna
h
g
-
to-git:
a
b
ort if the project
directory is not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos
Vajna
hg-to-git: avoid rai
s
in
g
a
string excep
t
ion
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
V
ajna
INSTALL: Update section about
gi
t
-fr
o
tz form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos
Vajna
Retire
'
stupid' m
e
rge
s
trategy
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
A
dd new t
e
s
t case
to
e
nsure g
i
t-merge r
e
d
u
ces
o
ctopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add
n
ew test to ensure
g
i
t
-
me
r
ge handles more
t
ha
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Introduce get_o
c
topus_
m
e
rge
_
bases() in
com
m
it
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los
V
ajna
gi
t
-f
m
t
-
merg
e
-msg: make it usable from othe
r
b
uiltins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Move read_cache_un
m
erged()
to read-ca
c
he
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Add new test to
ensure
git-m
e
rge handles pull
.
twoh
e
ad
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move parse-op
t
ions's skip_prefix() to git-compat-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Va
j
na
M
ove
com
m
it_lis
t
_count
(
)
t
o comm
i
t
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move split_c
m
dline() to alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Mi
k
los V
a
jna
path-list documentation: docu
m
ent al
l
functions and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
M
i
klos Vaj
n
a
run-co
m
m
a
nd documentatio
n
:
fix "memset()" parame
t
er
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos V
a
jna
git-read
-
t
ree: document -v option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos V
a
jna
A
s
imp
l
e script to p
a
r
s
e the res
u
lts
f
rom the t
e
stcases
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
git-reba
s
e -i: menti
o
n
the shor
t
c
omm
a
nd aliases in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklo
s
V
a
jna
Re
m
o
v
e unused
c
ode in parse_
c
ommit_buffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
Str
b
uf docu
m
entation: d
o
cumen
t
m
o
st funct
i
ons
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Revisi
o
n walki
n
g documenta
t
ion:
d
ocu
m
ent most im
p
orta
n
t
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
next