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
git-am: propagate --3way options as well
2008-12-03
M
i
klos
Vajn
a
submodule:
use git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os Vajna
reb
a
se: use git rev-parse
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
pull: use git rev
-
parse
-q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Va
j
na
lo
s
t-found: use git r
e
v-pars
e
-
q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
M
i
k
los Vajna
fi
l
ter-branch: use git rev-pa
r
se -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
git-stash:
u
se git rev-parse -q
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-12-02
Miklos Vajna
U
s
e
r's M
a
nua
l
: remove duplicated
u
rl at the e
n
d of
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
M
i
klo
s
Vajna
builtin_clone: u
s
e st
r
buf in cmd_clone()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
M
i
klos Vajna
bui
l
t
in-clone: use strbu
f
in clone_l
o
c
a
l() and c
o
p
y
_o
r
_
link
_
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-25
M
iklos Vajna
b
uil
t
in-clone: use str
b
u
f in
g
uess_dir_name()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-24
Miklos Vajna
Add new testcase
to
s
how fast-expo
r
t does
n
ot always
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mi
k
l
os Vajna
builtin-branch: use str
b
uf
i
n rena
m
e
_
branch()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos
Vajna
builtin-
b
ranch:
u
s
e strbuf
in fi
l
l_tracking_info()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
M
i
klos Vajna
b
ui
l
tin
-
branch: us
e
strbuf
i
n del
e
te_bra
n
ches()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-18
Mik
l
os Vajn
a
Updat
e
H
u
n
garian
t
ran
s
lation
.
100% completed
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vaj
n
a
git
-
remote: document the migration f
e
ature of
t
he
ren
a
me
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-remote r
e
name: migrate
f
r
o
m
remotes
/
and branches
/
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-11
Miklos V
a
jna
rem
o
te: add a
n
ew 'origin'
var
i
able
t
o the stru
c
t
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajna
Impleme
n
t g
i
t remote rename
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Mikl
o
s Vajna
update-ref --no-deref -d: h
a
ndle t
h
e
case when the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklo
s
V
a
jna
g
it bran
c
h -m:
forbid ren
a
ming of a
s
ymref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Mik
l
os Vajna
Fix git updat
e
-
ref --no-
d
eref -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
rename_ref(
)
: handle the case when the refl
o
g
of
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
kl
o
s Vajna
Fix
g
it branch -m fo
r
symref
s
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
Miklos
V
ajna
pars
e
-opt: migrate builtin-chec
k
out-inde
x
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos
V
a
j
na
Add testcase to ens
u
re merg
i
ng an early part of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
M
iklos Vajna
A
d
d
Lin
u
x
P
PC
suppo
r
t to the
p
re-a
u
to-
g
c example hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
M
i
klos
V
ajna
test-lib: fix color
r
eset in say_colo
r
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Mik
l
os Vajna
Implement git clone -v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajn
a
Cleanup i
n
sha1
_
f
ile
.
c::cache_or_unp
a
c
k
_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
M
i
k
l
o
s
V
ajna
b
uiltin-commit:
u
se re
d
uc
e
_heads() only when appropri
a
te
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vaj
n
a
builtin-merge: refr
e
sh
t
he
i
ndex bef
o
re c
a
lling a strat
e
g
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
V
aj
n
a
t7603: add new testc
a
s
e
s
to ensure
b
uiltin
-
c
ommit
u
ses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
Vajna
built
i
n-commit: use commi
t
_t
r
ee()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
commit_tree(): add a new
author
pa
r
amet
e
r
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
Vajna
t7501
:
always use t
e
st_cmp
i
nstead
o
f d
i
ff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Mikl
o
s Vajna
builtin-m
e
rge: relea
s
e the lockfile
in t
r
y_merge_strat
e
gy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
los Vajna
merge-recursive: get rid of virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
klo
s
Vajna
m
e
rge-r
e
cursive: m
o
ve current_{file,director
y
}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recur
s
ive: move
the g
l
obal obuf
t
o
stru
c
t merge_
o
ptions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
iklo
s
Vaj
n
a
mer
g
e-recursive: get ri
d
of the in
d
ex_only global
vari
a
ble
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
M
i
klos Vajna
merge-recursi
v
e: move call_dep
t
h to s
t
ruc
t
me
r
ge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
Ma
k
efile: 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/r
e
vert: ma
k
e d
i
rect in
t
er
n
al
call
t
o mer
g
e_tree()
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
los Vajna
b
u
iltin-
m
e
rge
:
avoid run
_
c
ommand
_
v
_
o
p
t
() for recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vaj
n
a
me
r
ge-recu
r
siv
e
: introduce
m
er
g
e_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
Split o
u
t
m
erge_recu
r
sive()
to merge-re
c
ursiv
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makefile: enable
S
N
PRINT
F
_RETURNS_
B
OGUS for HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
M
iklos Vajna
Fix
'
git help
h
e
lp'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Mi
k
lo
s
V
ajna
t9300: replace '!' with test_must_f
a
i
l
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
M
iklos Vajna
Documentati
o
n:
d
o
cument t
h
e pager
.
* con
f
igura
t
i
on settin
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Mikl
o
s Vajna
Builtin git-hel
p
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
M
iklos Va
j
na
b
uiltin-hel
p
: always load_comman
d
_
l
i
st() in c
m
d_help(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vaj
n
a
Add a seco
n
d
testcase for handlin
g
invalid
str
a
tegies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mikl
o
s
Vaj
n
a
Add
a
n
e
w test for using a custom
m
erg
e
st
r
at
e
gy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mikl
o
s Vajna
builtin-merge: allo
w
using a custom str
a
tegy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
V
ajna
b
u
iltin-he
l
p
:
m
ake some
i
nternal functions availa
b
le
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Mikl
o
s Vajna
t7601
:
extend
the 'merg
e
pick
s
up
the best resu
l
t'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vaj
n
a
built
i
n-merge: give
a
proper
e
rror message
f
or invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mikl
o
s Vaj
n
a
Teac
h
'git merge'
t
h
a
t some merge s
t
r
ategies no longe
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mi
k
los
Va
j
n
a
Add a new test
for git-merge-
r
e
solv
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: add a new test for git-merg
e
-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
ajna
m
a
k
e
rem
o
ve-dashes:
apply to sc
r
ipts and programs
as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
ajna
git-bise
c
t: us
e
dash-less form
o
n git bis
e
ct log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-hash-o
b
ject
.
sh: use q
u
o
tes for the
test
descrip
t
ion
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os Vajn
a
t00
0
1-init
.
sh: cha
n
ge c
o
n
f
usi
n
g dir
e
c
tory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Mi
k
l
o
s Vajna
Build in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
iklos
V
ajna
Fix t7601-merge-
p
ull-c
o
nfig
.
sh on
AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s
V
a
j
na
git-
c
om
m
i
t
-
tree: mak
e
it usable from other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos
V
ajna
Add n
e
w test case to e
n
sure git-merg
e
prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
j
n
a
h
g
-to-git: use gi
t
init instead of
g
it
init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
h
g-to-git:
r
ewrite "g
i
t-frotz" t
o
"git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
ikl
o
s
Vajna
hg-to-g
i
t: abort if t
h
e p
r
ojec
t
directory is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: avoid rai
s
ing a string exceptio
n
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
INSTA
L
L: Update section about gi
t
-
f
rotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos
Vajna
Re
t
ire 'stupid'
m
erge stra
t
eg
y
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Add new test case
t
o
e
n
sure g
i
t-merge re
d
u
ces octopu
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Add new
test to ensure gi
t
-merg
e
handles mor
e
than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
I
n
troduce ge
t
_octopus
_
merge_b
a
ses
(
)
in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
git
-
fm
t
-mer
g
e-msg: make
i
t
usab
l
e from other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
o
ve
r
e
ad_cac
h
e_unmerged()
t
o read-ca
c
he
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add ne
w
test to ensure git-merge handles pull
.
twohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
Move par
s
e-
o
ption
s
's skip_prefix() to git
-
compa
t
-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Move c
o
mmit_list_count()
to commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move
split_cmdline() to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mi
k
los Vajna
path-list d
o
cumentation: d
o
cumen
t
a
ll functions and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklo
s
Vajn
a
run-comman
d
do
c
umentation: fix "memset
(
)"
p
ara
m
eter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Mi
k
los Vajna
git
-
read-tree: document -v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A si
m
ple s
c
ri
p
t to parse the results fro
m
the testcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos Vajna
g
it-rebase -
i
: m
e
ntion the s
h
o
rt comman
d
aliases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
kl
o
s Vajna
Rem
o
ve
unu
s
e
d
code in parse_commit_buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
Strbuf
d
ocumentation: documen
t
most
f
un
c
tions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Revisio
n
wa
l
king
d
ocumentation
:
do
c
ument most important
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajna
C
o
dingGui
d
eline
s
:
A
dd a
n
o
te to avoid a
s
s
i
g
n
ments inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Mi
k
los Vajna
git-merge:
exclude
u
nnecessary option
s
f
r
om
OPTIONS_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Mikl
o
s Vajna
git-
f
ast
-
import
:
r
enam
e
cmd_*() functio
n
s to par
s
e_*
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
M
iklos Vajna
INSTA
L
L: add a note about GN
U
interactive
t
ools h
a
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
iklos Vajna
Ad
d
t
est
s
for sendemail
.
cc
con
f
ig
u
ration variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
gi
t
-send
-
email: add a new send
e
mail
.
c
c
c
onfiguration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mi
k
los V
a
jna
git-format-patch: add a new format
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next