repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
remote: add a new 'origin' variable to the struct
2008-11-11
Miklos Vajna
remote: ad
d
a ne
w
'origin' variable to the struct
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajna
I
mplement git remote
r
ena
m
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-01
Mik
l
os V
a
jna
update-ref --no-deref -d: hand
l
e the case when th
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-30
M
i
k
los Vajna
g
it b
r
anch -
m
: forbid r
e
naming
of
a s
y
mref
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
M
i
kl
o
s Vajna
Fix git updat
e
-ref --
n
o-d
e
ref -d
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
rename_ref(): handle
t
he case when the reflog of a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Miklos
Va
j
n
a
Fix git
b
ranch
-m for symrefs
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-19
Miklos V
a
j
n
a
parse-opt: migrate builtin-c
h
eckout-index
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-14
Miklos V
a
j
na
A
d
d te
s
tcase to e
n
s
ure mergi
n
g
a
n early p
a
rt
o
f a branch
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Vajna
Add Linux PPC s
u
ppo
r
t
to the
pre-auto-gc
e
xample hoo
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-10
M
ik
l
os Vajna
test
-
lib: fix color reset i
n
say_
c
ol
o
r()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-09
M
ik
l
os Vajna
Imp
l
e
m
ent git clo
n
e -v
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
C
l
eanup in s
h
a1_file
.
c::cache_o
r
_unpack
_
ent
r
y
()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-03
Mi
k
los Vajna
builtin-commit: us
e
reduce_heads
(
) only when
a
p
propriat
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-03
Miklo
s
V
ajna
built
i
n-merge:
r
efresh the index bef
o
r
e
calling a
s
trategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
M
i
kl
o
s Vajna
t7603: add new
testcases to ensure b
u
i
l
t
i
n
-commi
t
uses
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
Vajna
builtin-commit: use
commit_tree()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
V
ajna
commit_tree(): add a
n
ew
a
uthor parame
t
e
r
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t75
0
1
: always u
s
e test_c
m
p
i
nstea
d
of diff
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vajna
bu
i
lti
n
-mer
g
e: release
t
h
e
lockf
i
l
e
in
t
ry_merge_
s
trategy()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos V
a
j
n
a
merge-recursive: get ri
d
of virtua
l
_id
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
m
erge-recursive: mov
e
curren
t
_{file,d
i
r
e
ctory}_set
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recursiv
e
: move
the global obuf to s
t
ruct me
r
ge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos
Vajna
me
r
ge-recursive:
get rid o
f
t
h
e index_
o
nly glo
b
al variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-04
Miklo
s
V
a
j
n
a
me
r
ge-recurs
i
ve: move call_depth to struct m
e
rge_o
p
tio
n
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Miklos
Vajna
Makefile: a
d
d merge_recursiv
e
.
h to LIB_H
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
cherr
y
-pi
c
k/re
v
e
r
t: make direct int
e
rna
l
call to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajn
a
b
uiltin
-
merge: avoid
ru
n
_command_v_opt() for recu
r
sive
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
os
V
a
jn
a
merge-recursive:
i
ntroduce merge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Mikl
o
s Vajna
S
pl
i
t
out merg
e
_recursiv
e
(
) to
merge-recursive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Miklo
s
Vajna
Make
f
i
l
e: enable SNPRINTF_RE
T
URNS
_
BOGUS
f
or HP-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix '
g
it help he
l
p
'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos Vajn
a
t93
0
0: r
e
p
l
ace '!' with test_must_fa
i
l
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vaj
n
a
Documentation: d
o
c
u
ment the pager
.
*
c
o
n
figuratio
n
setting
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vajna
Builtin
g
it-h
e
lp
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Miklo
s
Vajna
bu
i
ltin-
h
elp: always lo
a
d
_
command_list() in cmd
_
help()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos Vajna
Add a second testca
s
e
for
han
d
ling invalid strategies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los V
a
jna
Add a new test for
u
sing a custom merge strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
M
i
k
l
o
s
Va
j
na
builtin-merge:
a
llow using
a
custo
m
str
a
teg
y
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin-help: make some intern
a
l functions available
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t
7601:
extend the 'merge picks up
t
he best result
'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklos
Vajna
builtin
-
merge: giv
e
a
p
roper error m
e
ssage for invalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Tea
c
h 'git merge' that some
merge strategie
s
no longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add
a
new
test
f
or git-merge-re
s
olve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: a
d
d a new test for git
-
merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
jna
make remove-dash
e
s: apply to scripts an
d
p
rograms as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bisect:
u
se dash-less fo
r
m on git bisec
t
log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-ha
s
h-object
.
sh: use quot
e
s for
t
h
e te
s
t description
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mi
k
l
o
s
Vajn
a
t
0
0
01-init
.
sh:
c
hange conf
u
s
ing directo
r
y name
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Miklos V
a
jna
Build in m
e
rge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fix t760
1
-merg
e
-pull-con
f
ig
.
sh
on A
I
X
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klo
s
Va
j
na
g
it-
c
ommit-t
r
ee: make it us
a
b
le from other builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
M
i
k
los Vajn
a
A
d
d
n
e
w tes
t
c
ase to en
s
ure git-me
r
g
e pr
e
pe
n
ds the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
lo
s
Vajna
h
g
-to-git: use git
i
n
i
t inste
a
d of git i
n
it
-
db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
o
s
Vajna
hg-to-git: re
w
r
ite "git-frotz" to "git frotz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajna
h
g
-t
o
-git: abort if
the
p
roj
e
ct directory is not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
los Vajna
hg-to-git: avoi
d
raising
a string exception
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajna
INSTALL: Update secti
o
n a
b
out
git-
f
r
otz
form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos
V
aj
n
a
Retire 'stupid' m
e
rge s
t
rat
e
gy
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Va
j
na
Add new
t
e
st case to
ensure git-
m
erge r
e
duces octo
p
us
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
Add ne
w
test t
o
ensure git-merge handles
more than
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
I
n
trod
u
ce get_o
c
topus_merge_bas
e
s() in commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-fmt
-
mer
g
e
-m
s
g: make it usab
l
e
from other
builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
V
ajna
Move read_cache_
u
nmerged() to r
e
ad-cache
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Add new test to ensure git-merge ha
n
dles pul
l
.
t
w
o
hea
d
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move parse-op
t
ions's skip_pref
i
x() to git-compat-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Move commit_l
i
s
t_coun
t
() to
c
ommit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
M
o
ve split_cmdl
i
ne() to alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos V
a
jna
path-li
s
t
d
ocu
m
entation:
document all
functi
o
n
s
a
nd
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
M
iklo
s
V
a
jna
ru
n
-
c
o
mmand documentation
:
fix
"
m
emset()"
p
aramet
e
r
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
M
i
klos
V
ajna
git-read-tree: do
c
ument -v option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mikl
o
s Vajna
A simp
l
e
script to parse the re
s
ults from the testcas
e
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los Vajna
git-rebase -i
:
mention the
s
hort
comm
a
nd ali
a
ses in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
R
e
move unused code
i
n p
a
rse_
c
ommit_buffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Mik
l
os
Vajna
Strbuf
d
ocumentation:
document most fun
c
tions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
Revision walking
documentation
:
document most import
a
nt
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
M
i
klos Vajna
Co
d
i
n
gGuidelines: Add a
n
ote to avoid assignments i
n
s
ide
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Miklos
V
ajna
git-merge: exclude unn
e
cessary
o
ptions
f
ro
m
OPTION
S
_
SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajn
a
git-fast-imp
o
r
t: rena
m
e
c
md_*(
)
fun
c
tions to p
a
rse_
*
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
M
i
klos Vajna
I
NSTAL
L
:
a
dd a no
t
e ab
o
u
t GNU i
n
ter
a
ct
i
ve
too
l
s
has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Add tests
for sendemail
.
cc configuration variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
M
iklos
Vaj
n
a
git-send-email: a
d
d a
n
ew
s
ende
m
ail
.
cc configuratio
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
M
i
k
los Vajna
git-form
a
t
-pat
c
h: add a new forma
t
.
cc configurati
o
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
git checkout:
a
dd -t
a
li
a
s
for -
-
track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Mik
l
os Vajna
di
f
f optio
n
s d
o
cumentation: refer to --diff-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Va
j
na
c
o
ntrib/
h
ooks
:
ad
d
an examp
l
e p
r
e-auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajn
a
Docum
e
ntat
i
o
n
/hooks
:
add pre-au
t
o
-
gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
V
ajna
git-gc --auto
:
add
p
re-auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajn
a
Document
a
tion/git-merge: document subtree s
t
rategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
M
iklos
V
ajna
git-gu
i
:
U
pdated
H
ungarian translation (e5fba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
Update Hu
n
garia
n
tran
s
la
t
ion
.
100% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos
Va
j
na
Improve t6029 to
c
heck
t
he rea
l
"subtree" case
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
M
iklos V
a
jna
Documentation/git svn
l
og:
ad
d
a no
t
e about timezones
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Mi
k
los V
a
jna
Documentat
i
on/git-filter-br
a
n
ch:
add a new msg-fil
t
er
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Va
j
na
git
-
cle
a
n: han
d
l
e
errors
if removin
g
fi
l
es fails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajna
Documenta
t
ion/git-stas
h
: doc
u
m
e
nt o
p
tions for git st
a
s
h
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Miklos
V
a
jna
git
c
l
one
-s do
c
umentation: force a
n
ew pa
r
agraph for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajna
b
uil
t
i
n
-gc
.
c:
g
uard config p
a
rser
from value=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
git rev-parse manpage:
spelling
fix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Miklo
s
Vajna
git pu
l
l manpage:
don't include -n from fetch-op
t
i
ons
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
next