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
V
ajna
remote: add a new
'origin' v
a
riable
to the struct
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-05
Mikl
o
s
Va
j
na
Im
p
lement git remote rena
m
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-01
Miklo
s
Va
j
na
update-ref --no-deref -d: ha
n
d
l
e
t
h
e
c
ase when the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-30
Miklos Vajna
git branch -m
:
forbid renaming
o
f a symref
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
F
ix git update-ref
--no-der
e
f -d
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Miklos V
a
jna
rena
m
e_
r
ef():
h
andle
th
e
case
wh
e
n the
r
eflog
o
f a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Mikl
o
s
V
ajna
Fix gi
t
branch -m f
o
r symrefs
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-19
Mikl
o
s Vajna
parse
-
op
t
: migrate builtin
-
ch
e
c
k
out-
i
ndex
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-14
Miklo
s
Vajna
Add
testcase to
ensure mergin
g
an e
a
rly part of
a
bra
n
c
h
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-14
Mi
k
los Vaj
n
a
Add Linux PPC support t
o
the pre-auto-gc ex
a
mple hoo
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-10
Miklos
V
a
jna
test-l
i
b: fix colo
r
reset in say
_
color
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-09
Mikl
o
s Vajn
a
Imple
m
ent git
c
lone -v
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-09
Miklo
s
Vajna
Cl
e
anup
i
n
s
ha1_
f
i
le
.
c::
c
ache_
o
r_unpack_e
n
try(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builtin-c
o
mmit: use reduce_heads(
)
only when a
p
propriate
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-03
M
iklos V
a
jna
builti
n
-merge: refresh the index before calling
a strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7603: add new
t
estcases to
ensure
builtin-commit uses
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Va
j
n
a
builtin-commit:
u
se
com
m
it_tree()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
M
i
k
l
o
s
V
a
jna
com
m
it_tree(): a
d
d a new au
t
hor pa
r
ameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos V
a
jna
t
7501: alwa
y
s
u
s
e test_cm
p
instead of diff
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-07
Miklos
V
ajna
built
i
n-merge: release the l
o
c
kfil
e
in try_mer
g
e_s
t
r
a
tegy()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vaj
n
a
merge-recurs
i
ve: get r
i
d of vir
t
ual
_
id
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
os Vajna
m
erg
e
-recursive: move curr
e
nt_{file,dire
c
tor
y
}_set
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
los Vajna
merge-re
c
ur
s
i
v
e: move the global obuf
t
o
struct
m
e
r
ge_
o
ptio
n
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
M
ik
l
o
s
Vajna
merge-recursive: ge
t
rid of the in
d
ex
_
only global vari
a
ble
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-04
Mikl
o
s Vajna
merge-recu
r
s
ive: move ca
l
l_depth to struct merge_o
p
t
i
ons
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
Ma
k
efile: add merge_recur
s
ive
.
h
t
o
LI
B
_H
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Miklos V
a
jna
cherry-pick/revert: make direct internal call t
o
merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
M
iklos Vajna
b
u
ilti
n
-
merge
:
avoid run_command_v_opt() for r
e
cursive
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
M
i
klos Vajna
merg
e
-recursive: introduce merge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
Split
o
ut me
r
ge_
r
ecur
s
ive() to m
e
rge-recursive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makefile: enable SNPRI
N
TF_RETURNS_B
O
GUS for
HP-UX
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 V
a
jna
t9300: r
e
pla
c
e
'!' wi
t
h test_
m
ust
_
fail
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Mikl
o
s Vajna
Docum
e
ntation: d
o
c
ument the pager
.
* configu
r
at
i
o
n
set
t
ing
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vajna
Builtin
g
it-help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
builtin-help: always
l
oa
d
_co
m
mand_list() in c
m
d_help()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
na
Add a second testcase for handl
i
n
g
in
v
alid strategies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
V
ajna
Ad
d
a
new
t
est f
o
r us
i
ng a
c
us
t
om merge strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklo
s
Vajna
builti
n
-
m
erge: allow us
i
ng a custom strate
g
y
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin-
h
elp: make some internal fu
n
c
tions available
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Mi
k
l
o
s Vaj
n
a
t7601: exte
n
d the '
m
erge
p
icks u
p
t
he best resul
t
'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
built
i
n-merge: give a prope
r
error me
s
sage
fo
r
invalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Mikl
o
s Vaj
n
a
T
e
ach
'git merge' that some merg
e
strategies no longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos
Va
j
na
A
d
d a new t
e
st f
o
r git-merge-
r
esolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: add a new
tes
t
fo
r
g
i
t-merge-
r
esolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make remove-dashes: apply to scri
p
t
s
and p
r
ograms as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
Vajna
g
i
t-bisect: use
dash-les
s
f
o
rm o
n
git
b
isect log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
M
ik
l
os Vaj
n
a
t1007-hash-ob
j
ect
.
sh: use quotes f
o
r the test description
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vaj
n
a
t0001-ini
t
.
sh: change
c
on
f
using
d
irectory n
a
me
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Mi
k
los Vajna
Build in merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vaj
n
a
Fix t7
6
01-merge-pull-
c
o
nfig
.
sh on
AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
git-commit-tree
:
m
a
k
e
i
t usa
b
le from
o
ther builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add
n
e
w
test case to en
s
ure
g
it-merge pr
e
pends the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
h
g-to-gi
t
:
us
e
git init
instead
o
f git init-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklo
s
Vajn
a
hg-to-
g
it: rewrite "git-
f
rotz" to "git f
r
otz
"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: abort
if the p
r
oject directory is not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os Vajna
hg
-
to-
g
it: avoid ra
i
sing a string exce
p
tion
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INST
A
LL: Upd
a
te
sectio
n
about g
i
t-frotz form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
M
i
klos Va
j
n
a
Retire 'stu
p
id
'
merge strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
d
d new test case to
e
ns
u
r
e
git-merge reduces octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add
n
ew tes
t
t
o
e
nsure
g
i
t
-merge
h
and
l
es mo
r
e t
h
an
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Introduce get_octopus_merge_bases
(
)
in
commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-fmt-mer
g
e-msg: make it usable f
r
om other bu
i
ltins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Move read_c
a
che_unmerged() to read
-
cache
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vajna
Add new
t
est to en
s
ure git-
m
erge handle
s
p
u
ll
.
twohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Va
j
na
Move parse-optio
n
s's skip
_
prefix() to git
-
compat-
u
til
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
o
s
Vaj
n
a
Move co
m
mit_list_c
o
unt() to comm
i
t
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Va
j
n
a
M
o
v
e s
p
li
t
_cm
d
line() to alias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklo
s
Vajna
pat
h
-l
i
st doc
u
mentation: document all
f
unct
i
ons and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos
Vajna
run-command documentation
:
fix "memset()" parameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-read-
t
ree:
d
ocument
-v option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A simple script
to p
a
r
se the
r
es
u
lt
s
from the
t
e
s
tcases
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos Vajna
g
i
t-rebase -i: m
e
n
tion the shor
t
command
a
lia
s
es in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
Remove u
n
u
sed code
in parse_commi
t
_
buff
e
r()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
M
iklos Vaj
n
a
S
trbuf documentation:
doc
u
ment most functions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
M
ik
l
o
s
V
ajna
Re
v
i
s
ion walking doc
u
mentation:
d
ocu
m
ent most i
m
p
o
rtant
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajna
CodingGuidelines: Add a
note to avoid assignments insi
d
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
git-
m
e
r
g
e: exclude unne
c
e
s
sary options
f
rom OPTIONS_SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklos
V
ajna
git-
f
ast-import
:
ren
a
me cmd_*() functions
to parse
_
*
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INSTALL: add
a
note about GN
U
inter
a
c
tive tools h
a
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Add tes
t
s
for sendemail
.
cc config
u
ration variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vaj
n
a
g
i
t-send-em
a
i
l
: add a new sendemail
.
cc co
n
fi
g
uration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos V
a
jna
git-
f
ormat-patch: add a new format
.
cc co
n
figuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
M
iklos V
a
jna
git chec
k
o
u
t
:
add -t al
i
as for --track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vajna
diff opti
o
ns docum
e
n
ta
t
ion: refe
r
t
o
-
-
diff-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
con
t
rib/hook
s
:
a
d
d
an
e
x
ample pre
-
a
u
to-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
D
ocumentat
i
o
n
/h
o
o
k
s
:
add
pre
-
auto-gc ho
o
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
i
klos Vajna
g
it-gc
--auto: add pre-auto-g
c
hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Va
j
na
Documentation/git-merge:
d
ocument
subtr
e
e strategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Miklos V
a
jna
gi
t
-gui: Updat
e
d
Hungarian
t
r
a
nslation (e5fba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vaj
n
a
Update Hun
g
arian translat
i
o
n
.
100% complet
e
d
.
commit
|
commitdiff
|
tree
2008-02-29
M
iklos
V
ajna
Improve t6029 to check the
r
e
al
"subtree"
c
a
se
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Mikl
o
s Vajn
a
Documenta
t
ion/git svn log: a
d
d a note about
timezones
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
Documentati
o
n/git-
f
i
l
ter-branch: add a new msg-filt
e
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vaj
n
a
git
-
clean: handle errors if re
m
ovi
n
g files f
a
ils
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vaj
n
a
D
o
c
u
men
t
a
t
ion/git-stash:
docu
m
ent options
f
or g
i
t stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vajna
git clone -s docu
m
e
n
t
a
tio
n
: fo
r
ce a new
paragraph for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajna
builtin-gc
.
c: guard config pars
e
r from value=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
gi
t
rev-parse man
p
a
g
e: sp
e
lling fix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Miklos
V
a
j
na
git pull manpage: do
n
't inclu
d
e -n from fetc
h
-options
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
next