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
git-remote: document the migration feature of the rename subcommand
2008-11-12
Miklos Vajna
git-r
e
mot
e
: doc
u
ment the migrati
o
n feature of
t
h
e
rename
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-12
Miklos Vajna
git-remote rename: m
i
grate from remotes/ and
branches/
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-11
Miklos Vaj
n
a
remote:
a
dd a new 'origin' vari
a
ble to th
e
struct
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-05
Miklos Vajn
a
I
m
p
l
e
ment
g
it
remote rename
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-11-01
M
i
klos Vajna
update-ref --no-deref -d: hand
l
e the case when the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-30
Miklos Vajna
gi
t
b
r
a
n
ch -m: forbid ren
a
ming of a s
y
mref
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
Fix git update-ref --no-
d
eref -
d
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Miklos V
a
jna
rename_
r
ef(): handle the case when t
h
e reflog of
a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-26
Mi
k
los
Va
j
na
F
i
x
git branch -m for
symrefs
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-19
Miklos Vajna
parse-o
p
t:
m
igrate builtin-checko
u
t-index
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-14
Mik
l
os Va
j
na
A
dd testcase t
o
ensure merging an
e
arly part of a br
a
nch
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-14
M
iklos Vajna
Add Lin
u
x P
P
C support to the pre-auto-gc example hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-10
M
i
klos Vajna
test
-
lib: fix color reset in say_color()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-09
Mikl
o
s Vajna
Im
p
lemen
t
g
it clone -
v
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-09
Miklos Vajna
Clean
u
p in sha1_file
.
c::cache_or_unpack_entry()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-03
Mik
l
os Vajna
buil
t
in
-
c
o
mmit: use reduce
_
head
s
()
o
nl
y
when
a
ppropr
i
ate
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-10-03
M
iklos
V
ajn
a
bu
i
l
t
in
-
me
r
ge: refresh
t
h
e index befor
e
callin
g
a
strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Mi
k
los
Vajna
t7603: add new testcases to ensure bu
i
ltin-commit uses
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
bu
i
ltin-
c
ommit
:
use commit_tre
e
()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vaj
n
a
co
m
mit_tree(): add
a
new author parameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos V
a
jna
t7501
:
alwa
y
s use test_c
m
p i
n
stead of diff
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-07
M
i
k
los
V
ajna
builtin-merge: release the lockfile in try_
m
erge_strategy()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklo
s
Vajn
a
merge-
r
ecursive:
g
e
t
rid of virtual_id
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
m
erge-
r
ecursive: move c
u
rr
e
nt_{
f
i
le,directory}_set
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
os Vajna
merge-recursive: move the global obuf to str
u
c
t
merg
e
_opti
o
ns
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
M
ikl
o
s Vajna
merge-recursive:
g
et rid
o
f the
i
n
d
ex_on
l
y
g
lobal varia
b
le
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-04
Miklos
Va
j
na
merge-recurs
i
ve: move cal
l
_depth t
o
s
truct
m
erge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Mi
k
los Vajna
M
a
ke
f
i
l
e: add merge
_
r
ecursive
.
h to LIB_H
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Mi
k
l
o
s Vajna
cherry-pick/revert: make direct i
n
ternal
c
a
ll to merge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vaj
n
a
builtin-m
e
rge: avoid run_comma
n
d_v_
o
pt() f
o
r recursi
v
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
merge-r
e
cursive: in
t
roduce mer
g
e_opti
o
n
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
l
os
V
ajn
a
Split out merge
_
rec
u
rsive() to
m
e
rge-recursive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Mik
l
os
V
ajna
Makefile:
e
nable
S
NPRINTF_
R
ETURNS_
B
OGUS for HP-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
M
i
k
l
o
s Vaj
n
a
Fix 'git help help
'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklos V
a
jna
t9300: rep
l
ace
'
!' with test_must_fai
l
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Miklos V
a
jna
Documenta
t
ion: document the page
r
.
* configuration s
e
tting
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Mikl
o
s
Vajna
Builtin
git-help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
b
u
il
t
in-help: alway
s
load
_
command_list() in cmd_help()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Vajna
Add a second testcase
f
o
r
handling i
n
v
a
lid
s
t
r
a
t
egies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mik
l
o
s
Vaj
n
a
Add a n
e
w test for using a
c
ustom
m
erge s
t
rateg
y
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin-m
e
rge: allow u
s
ing a
c
u
s
tom s
t
rateg
y
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos Vajna
b
uil
t
in
-
he
l
p: make some in
t
ernal
fun
c
t
i
ons
ava
i
la
b
le
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t76
0
1: ext
e
nd the
'merge
pi
c
ks up the best
r
es
u
lt'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
builtin-merge: give a proper e
r
ror message
f
or
invalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teach 'git merge'
that
som
e
merge
s
trategie
s
no long
e
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
M
i
klos Vajna
Add a new test for git-mer
g
e-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Mik
l
o
s
Vajna
t
6
0
21: a
d
d a new test for
g
it-merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
jn
a
mak
e
remove-dashes: apply
t
o
scrip
t
s and programs as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
o
s V
a
j
n
a
git-bisect: use dash-le
s
s fo
r
m
o
n git bisec
t
log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
aj
n
a
t1007-hash-objec
t
.
sh: u
s
e qu
o
t
e
s f
o
r the
t
e
st
d
escription
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
n
a
t
000
1
-i
n
it
.
sh
:
cha
n
ge
c
onfusing director
y
n
a
me
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
M
i
k
l
os Vajna
Build
i
n merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os Vajna
Fi
x
t7601-mer
g
e-pull-config
.
sh on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Va
j
na
g
it-comm
i
t-tree: make it
u
sable from
other buil
t
ins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add new test ca
s
e to ensu
r
e
git-
m
erge prepends the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
hg-to
-
git:
u
s
e git init in
s
tead of git init-
d
b
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
los Vajna
h
g-to
-
git: re
w
rite "git-
f
rot
z
" to "git f
r
otz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
o
s Vajna
hg-to-git: abort
if the project d
i
r
ectory is
n
ot a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
h
g-to-
g
i
t:
a
void rai
s
ing
a
str
i
ng exception
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
I
N
ST
A
L
L: Upd
a
te s
e
ction abo
u
t git-
f
rotz
f
o
r
m
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
M
i
klos Vajna
Ret
i
re 'st
u
pid'
m
erge strategy
commit
|
commitdiff
|
tree
2008-07-01
M
ik
l
o
s
Vajna
Add new test cas
e
to e
n
s
ure git-merge redu
c
es octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Add new test to e
n
sure git-merge h
a
ndles more than
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Introduce
g
et_octopu
s
_
m
erg
e
_ba
s
e
s
() in commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajn
a
g
i
t-fmt-merge-ms
g
: ma
k
e it usable from ot
h
er buil
t
ins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
Move read_cache
_
unmerged() to read-cache
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Va
j
na
A
d
d new t
e
st
t
o ensure
g
it-merge handl
e
s
pull
.
two
h
ead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Mo
v
e pa
r
s
e-options's skip_prefix() to gi
t
-compat-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos
V
ajna
Move
commit_list_
c
ount() to com
m
i
t
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Mo
v
e s
p
lit_cmdline() to ali
a
s
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Va
j
n
a
path-list do
c
umenta
t
ion
:
document all fu
n
ctions and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Mi
k
los Vajn
a
run-co
m
mand d
o
cumentation: fix "memse
t
(
)
" parameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vaj
n
a
git-read-tree: d
o
cument -v
option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos Vajna
A
simp
l
e script to p
a
rse the results fr
o
m the testcases
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
git-rebase
-i: mention the short command alia
s
es in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
Remo
v
e
unu
s
ed code
i
n
parse_commi
t
_buf
f
er()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
M
i
klos
V
ajna
St
r
buf d
o
cumentation: docume
n
t most functions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
M
iklos
Vajna
Revision walking documentation: docu
m
ent most important
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Mikl
o
s Vajna
C
odingGuidel
i
nes: Add
a not
e
to avoi
d
a
ssignments ins
i
de
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Mikl
o
s Vajna
git
-
merge:
e
xclude
u
nnecessary opt
i
ons from OP
T
IONS_SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklos Vajna
git-fa
s
t-import: rename c
m
d
_*() f
u
nct
i
ons to parse_*()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Mi
k
los Vaj
n
a
INSTALL: add a note
a
bout G
N
U interactive tools
h
as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
A
dd
t
ests for sendem
a
i
l
.
cc config
u
ration variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mi
k
l
o
s
Vajna
git-send-email: add a new sendemail
.
c
c
c
onf
i
gurati
o
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git
-
format-patch: add a n
e
w format
.
cc
config
u
ration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
git che
c
kout:
add
-t
a
l
ias f
o
r
--track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vaj
n
a
diff options d
o
cumen
t
a
tion: refer to --diff-filt
e
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
M
iklos Vajna
c
ontri
b
/h
o
oks:
add an exa
m
ple pre-au
t
o-gc hoo
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
Docu
m
entation/hooks: a
d
d pre-auto-gc hoo
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
git-g
c
--
a
u
t
o: add pre-auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajna
D
ocumentation/git-merge: document
s
u
b
tree strategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
M
i
klos Vaj
n
a
git-gui: Updated Hungarian translation (
e
5fba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Miklos Vajna
U
p
date H
u
ngarian translatio
n
.
100%
completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajn
a
Im
p
r
o
v
e
t6029
t
o check
t
he real "
s
u
btree" ca
s
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklos V
a
j
n
a
D
o
cumentation/git sv
n
log
:
add a n
o
te a
b
out tim
e
zones
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
D
ocum
e
n
tation/git-filter-branch
:
add a new msg-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajn
a
g
i
t-cle
a
n: h
a
ndle errors i
f
removing
f
iles fails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Miklos Vajna
Do
c
umentation/git-stash:
d
ocument options for git stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Mikl
o
s Vajna
g
i
t
clo
n
e
-s documentat
i
on: f
o
rce a new
para
g
rap
h
f
or
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Mi
k
los Vajna
builtin-
g
c
.
c
: guard config parser from
va
l
ue=
N
ULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
next