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
combine-diff.c: use strbuf_readlink()
2008-12-17
Miklos Vajna
git-da
e
mon documentation:
use
{
t
ilde}
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Va
j
na
http
.
c: use 'gi
t
_config_st
r
i
n
g' to g
e
t
'
cu
r
l_http_
p
roxy'
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
Mikl
o
s Vajna
rebase: use git
r
ev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
Vajna
pull: u
s
e git re
v
-pa
r
se -
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
klos Vajna
lost-
f
ound: u
s
e
g
i
t rev-pa
r
se -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
los
V
ajna
fi
l
ter
-
bra
n
ch: use git rev-pars
e
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
iklo
s
V
ajna
git-
s
t
ash: u
s
e git rev
-
parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Mikl
o
s Vajna
User's
M
a
n
ual: re
m
ove
d
uplicated url at the end of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Vaj
n
a
builtin_clone: use strbuf in cmd_clo
n
e()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
M
i
klos
Vajna
builtin-clone
:
u
se s
t
r
buf in clone_local() and cop
y
_or_link_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
Miklos Va
j
na
bui
l
t
in-clone: use s
t
rbuf in
g
ues
s
_dir_name
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos Vajna
Add
n
e
w
test
c
ase to s
h
ow fast-export
d
o
es not always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
builtin-bra
n
ch: use strbuf i
n
rename_
b
ranch(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklo
s
Vajna
b
u
iltin-branch: use strbuf in fi
l
l_tr
a
cki
n
g
_
i
n
f
o
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos V
a
j
na
bu
i
ltin-b
r
anch: use str
b
uf in
d
elete_branc
h
es()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mi
k
l
o
s Va
j
na
Update Hung
a
rian
tra
n
slation
.
100% comp
l
eted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Va
j
n
a
git-remot
e
: docu
m
ent
t
he migration fea
t
ure of the rename
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
g
it-remote rename: migrate
f
r
o
m remo
t
es/ and branches/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos
V
ajna
remote:
a
d
d
a new 'orig
i
n' v
a
r
iable to t
h
e str
u
ct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos
V
ajna
Implem
e
nt git remote rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklos
Vajna
update
-
ref --no-deref -d: ha
n
dl
e
t
he case 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 of
a
symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos
Vajna
Fix
git update
-
ref --no-d
e
ref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
kl
o
s Vajna
rename_ref(): hand
l
e
the
case when the reflog
o
f a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mi
k
los Vajna
Fix git branch -m for
symrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos V
a
jna
pa
r
se-opt:
m
i
gra
t
e
b
uiltin-che
c
kout-
i
ndex
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos V
a
jna
Add testcase t
o
en
s
u
r
e
m
erging an
e
a
rly part of
a
branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mik
l
os Vajna
Add Lin
u
x PP
C
support
to the pre-auto-
g
c example hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos Va
j
na
te
s
t-lib: fix color reset in say_color()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos
V
a
jna
Implem
e
nt git clon
e
-v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
iklos Vajna
Cleanup
in
s
ha1_file
.
c::cache
_
o
r_unpa
c
k_en
t
r
y
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
M
i
klos Vajna
builtin-co
m
m
it:
us
e
reduce_heads() only
whe
n
app
r
o
priate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
M
i
klo
s
V
ajna
builtin-merge: refres
h
t
he
index before calli
n
g a strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mik
l
os Vajna
t7603: add new
t
e
stcases to e
n
sure builtin-commit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mikl
o
s Vajna
b
ui
l
t
i
n-
c
o
mmit:
use
c
ommit_t
r
ee
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
co
m
m
i
t_tr
e
e():
a
dd a
new
author parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vaj
n
a
t
7
501:
al
w
ays use test_cmp ins
t
ead of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vajna
builtin-merg
e
: release
the loc
k
fil
e
in
try
_
merge_strategy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merg
e
-recursive: get rid of
virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
iklos Vajna
merge
-
recursive: move
c
u
r
rent_{file,
d
irect
o
ry}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
los Vajna
merg
e
-re
c
ursive: move the
g
lob
a
l obuf to struct m
e
rge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
k
l
o
s Vajn
a
merge-re
c
u
rsive: get
r
id of
t
he
index_only
g
l
o
bal variab
l
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Mikl
o
s Vajna
m
e
rge-re
c
ursive:
move cal
l
_d
e
pth to st
r
uct merge
_
o
pti
o
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vaj
n
a
Make
f
ile: add merge_recursive
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
che
r
ry-pick/revert: make
d
irect internal call to
m
erge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
builtin-merge: av
o
id run_command
_
v_o
p
t() f
o
r re
c
ursi
v
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
V
a
j
na
merge-recu
r
sive: introduce
mer
g
e_
o
ptions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklo
s
Vajna
Split
o
u
t
m
erge_recursive
(
) to merg
e
-recur
s
ive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
M
i
k
l
o
s Vajna
Makefile:
enable
SNPRINTF_RETURNS_B
O
GUS for H
P
-U
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix 'git help help'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajna
t9
3
00: re
p
la
c
e '!' with test_must_
f
ail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vajna
D
ocumentati
o
n: document the pager
.
* confi
g
uration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vajna
B
u
iltin
git-h
e
l
p
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Mi
k
los Vajna
b
u
iltin-
h
elp: always
l
oad_command_list() in cm
d
_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklo
s
V
a
j
n
a
Add a second testca
s
e for
h
a
n
d
l
ing invalid strategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
Vajna
Add a new test fo
r
u
si
n
g
a custom merge strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
b
u
iltin-
m
erge: allow usin
g
a custo
m
st
r
ategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
bu
i
ltin-he
l
p: make so
m
e
intern
a
l
f
unction
s
availab
l
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t7601: exte
n
d the 'merge
p
icks
up the best r
e
sult'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
built
i
n-merge
:
give a
p
roper error
m
essage for inva
l
i
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mi
k
los
Vajn
a
T
eac
h
'git m
e
rge
'
th
a
t some
merge strategi
e
s no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos V
a
jna
Ad
d
a
new test
f
or git-merge-r
e
solve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t602
1
: add a ne
w
tes
t
for git-me
r
ge
-
resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make remove-dashes: appl
y
to script
s
an
d
programs as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bisect: use dash-less form on git bisect log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
Vajna
t1007-hash-object
.
s
h
: use
q
u
otes for th
e
test de
s
cript
i
on
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t0001-init
.
sh
:
chang
e
confusing directory n
a
me
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Build in
mer
g
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Va
j
na
Fix t7
6
0
1-
m
erge-pull-
c
onfig
.
s
h
on
AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git
-
commit-tre
e
: make it
usab
l
e f
r
om
o
ther bui
l
tins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajn
a
Ad
d
new test case to ensure git-mer
g
e prepen
d
s the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: use
git
i
nit
in
s
te
a
d of
g
it init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
jn
a
hg-
t
o-git: rewrite "git-fr
o
tz"
to "git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
h
g
-
to-g
i
t:
abort if th
e
projec
t
dire
c
tory i
s
not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-gi
t
: avoid raising a string exc
e
ption
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INSTALL: Upda
t
e section about git-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos
Vajna
Retire
'stupid' merge strategy
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
los Va
j
na
Add new test
c
a
se to ensure git-m
e
rg
e
reduces octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
d
d n
e
w tes
t
to en
s
ure git-merge
h
andles more
than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos
V
ajna
Intr
o
duce
get_oc
t
opus_m
e
rg
e
_bases(
)
i
n commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-
f
mt-merge
-
msg: make it
u
sabl
e
from o
t
h
e
r builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
Mov
e
read_cac
h
e_unmerged() to read-cache
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
na
A
d
d
new test to
en
s
u
re
git-merge handle
s
pul
l
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move p
a
r
s
e-
o
ptions's skip_
p
refix() to gi
t
-
c
omp
a
t-
u
til
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Move commit_list_count() to
c
ommit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Move
spl
i
t_c
m
dl
i
ne
(
) to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mik
l
os V
a
jna
path-lis
t
documen
t
at
i
on
:
document all functions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
r
un-command documentat
i
on:
fix
"memset()"
p
arameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
M
i
klos Vaj
n
a
git-re
a
d-tree:
d
o
cu
m
e
nt -
v
o
p
tion
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mikl
o
s
Vajna
A si
m
ple script to
pars
e
the result
s
f
rom the te
s
tcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vaj
n
a
gi
t
-rebase
-
i: mention
the shor
t
command aliases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
ikl
o
s Vajn
a
Remove unus
e
d code in parse_commit_
b
uffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
M
ik
l
os Vajna
Strb
u
f docu
m
entation: document most functio
n
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Rev
i
sion walk
i
ng
documentatio
n
: document most i
m
portant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Mi
k
l
o
s Vajna
CodingGuidelines: Add a n
o
te to
av
o
id assignments inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
M
i
klos Vajna
git-merge: exclude unnecessary opt
i
ons f
r
om OPTIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
M
i
klos
V
a
j
n
a
git-fast-im
p
o
rt: re
n
ame cmd_*() functio
n
s t
o
parse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INSTALL: add a not
e
a
bout GNU in
t
eract
i
ve tools ha
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
i
k
los Vaj
n
a
Add tests
f
or sendem
a
i
l
.
cc
configuration
variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next