repo.or.cz
/
alt-git.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
:
a
dd a n
e
w
'origin'
variable to the struct
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-05
M
iklos
V
ajna
I
mplement git remote renam
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-11-01
Miklo
s
Vajna
update-re
f
-
-
no-deref -d: handle th
e
cas
e
when the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-30
Miklos Vajna
git
branch -m: fo
r
bid renaming of a symref
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
M
i
klo
s
Vajna
Fix git
upd
a
t
e
-ref --no-de
r
ef -d
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
rena
m
e_re
f
():
h
andle t
h
e case whe
n
th
e
reflog o
f
a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-26
Miklos Vajna
F
i
x git branch -m for
s
y
mrefs
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-19
M
i
k
lo
s
Vajna
parse-op
t
: migrate builtin
-
ch
e
cko
u
t-inde
x
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Mi
k
los Vajna
Add
t
e
stcase
t
o ens
u
re mer
g
ing an
ea
r
ly part of a branch
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-14
Miklos Va
j
na
Add L
i
n
ux
PPC support to the
pre-auto-gc
e
xample h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-10
Miklos
Vajna
te
s
t
-
lib: fix color
r
eset in say_color(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
M
iklos V
a
jna
Impl
e
m
e
nt git c
l
on
e
-v
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-09
Miklos
V
a
j
na
C
l
e
a
n
up
i
n sha1_file
.
c
:
:cach
e
_or_
u
npack_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos V
a
jna
b
u
ilt
i
n-commit: us
e
reduce_heads(
)
only when a
p
prop
r
iate
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-10-03
Miklos Vajna
builtin
-
me
r
ge: refr
e
sh the index before ca
l
ling a
s
t
rategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
M
i
klo
s
Vajna
t7603: add new testc
a
ses to ens
u
re
b
u
i
ltin-com
m
i
t
uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mik
l
os Vajna
b
uiltin-commit
:
use commit_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
c
o
m
mit_tree(): add a new author paramet
e
r
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7501: al
w
a
y
s
use test_cmp instead of diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vaj
n
a
builtin-
m
erge: release the lo
c
kfile
i
n try_m
e
rge_s
t
rateg
y
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
los Vaj
n
a
merge-
r
ecursive:
get rid
o
f
virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
los
Vajna
merge-recursive: move curr
e
nt_{file
,
director
y
}
_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
o
s
Vaj
n
a
merge-recursive:
m
ove the global obuf to
struct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recursive: get rid
o
f the
i
nd
e
x_only
global variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Miklos
Vajna
merge
-
rec
u
rsive: move
ca
l
l
_dept
h
to st
r
u
c
t me
r
ge_o
p
tions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
iklos Va
j
na
Makefile:
add merge_recursive
.
h to LIB
_
H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
cherry-pick
/
revert: m
a
ke direct
i
nter
n
al
call to mer
g
e
_
tre
e
()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
builtin
-
merge: avoi
d
r
u
n
_command_v_opt(
)
for recursive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
m
e
rge-recursive: introduce
merge_opt
i
on
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
Vajna
Sp
l
i
t out m
e
rge_recursiv
e
(
) to merge-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Mik
l
os Vajna
Makefi
l
e: enable SNPRINTF_RET
U
RNS_BOGUS f
o
r HP-UX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
Miklos
V
a
j
na
F
ix 'g
i
t help h
e
lp'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
Mikl
o
s Vajna
t9300: replace '!' with test_must
_
fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
M
i
k
los Vajna
D
o
cumentation: document th
e
page
r
.
* c
o
n
f
iguratio
n
setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Mikl
o
s Vajna
Builtin
g
it-help
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
M
i
klos Va
j
na
builtin-help: always load_command
_
l
i
st() in cmd_
h
e
lp()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklo
s
Vajna
Add a se
c
o
n
d testcas
e
fo
r
h
a
ndling i
n
va
l
id strategies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mikl
o
s Vajna
Add a new
t
e
st for using a
c
u
s
to
m
merge strategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin-merge: a
l
l
o
w using a custom
stra
t
e
g
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklo
s
V
ajna
built
i
n-help: mak
e
some internal functi
o
ns available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
M
i
klos
Vajna
t7601: extend t
h
e 'm
e
rge pi
c
k
s up
the be
s
t result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklo
s
Vajna
builtin-merge: give a proper error m
e
ss
a
ge for invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Mik
l
os
Vaj
n
a
Teach 'git
merge' t
h
a
t
some merg
e
s
tr
a
tegie
s
no long
e
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos
V
aj
n
a
Add a new
t
est
f
o
r git-merge-re
s
olv
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mikl
o
s Vajna
t6021: add a new te
s
t
f
or git
-
merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos V
a
jna
m
ake remove-das
h
es: apply
t
o s
c
ripts
and
p
rogr
a
m
s
as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
na
git
-
bisect: use dash-less for
m
on git bisect
l
o
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-hash-object
.
s
h
: use quote
s
for the test
description
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
iklos Vajna
t0001-init
.
sh: chan
g
e
con
f
using directory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Build in merg
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fix t7601-
m
erge-pull-config
.
sh
o
n AI
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mik
l
os Vajna
git-commi
t
-tre
e
:
m
a
ke it
usa
b
le from other
builtin
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add
new test
c
ase
t
o
e
nsure g
i
t-
m
erge prepends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
iklo
s
Va
j
na
hg-to-git: use git init inste
a
d of git init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajna
h
g-to
-
git
:
rewrite "gi
t
-frotz" to "git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos Vajn
a
hg
-
to-git: abort if
the
p
roject director
y
is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
a
j
na
h
g-to-git: avoid raising a stri
n
g exc
e
ption
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INST
A
LL: Updat
e
s
ection about git-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Mikl
o
s Vajna
R
etire 'stu
p
id' me
r
ge strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
Add new test case
t
o
ens
u
re git-merge reduces octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Vaj
n
a
A
dd
n
ew test to ensure g
i
t-merge
h
a
n
dles more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Introduce get_octopus_merge_bases() in
c
ommit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos V
a
jna
git-fmt-
m
erge-ms
g
:
ma
k
e
it usab
l
e from oth
e
r builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Move read_cache_unm
e
rge
d
()
t
o
read-cac
h
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vaj
n
a
A
dd new t
e
st to en
s
ure g
i
t-merge handles pull
.
tw
o
h
ea
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklo
s
Va
j
n
a
Move pars
e
-options's skip_p
r
efix() to
g
it-compat-
u
til
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
l
os Vajna
Move commit_lis
t
_count(
)
to comm
i
t
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
a
j
na
Mov
e
spl
i
t_cmdline() to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Mi
k
los V
a
jna
path-list docum
e
ntation: document all functions
a
n
d
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos
V
a
jna
run-command docum
e
nta
t
ion: fix "memset(
)
" pa
r
ameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklo
s
Vaj
n
a
git-
r
ead-tr
e
e: document -v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mikl
o
s Vajna
A sim
p
le sc
r
i
p
t to par
s
e the results from
th
e
tes
t
cases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
a
j
na
git-rebase -i: menti
o
n the short
command aliases i
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los Vajna
Rem
o
ve
unused
c
ode in parse_com
m
i
t
_buffer(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklo
s
Vajna
Strbuf doc
u
mentation:
d
ocu
m
ent
most func
t
ions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
M
iklos
Vajna
Revision walking do
c
umen
t
ation
:
document
most
important
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Mi
k
l
o
s
Vajn
a
Cod
i
ngGuidelin
e
s
:
Add a
n
o
te
t
o a
v
oid assignm
e
nt
s
inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
git-merge: exclude unnece
s
sar
y
options
f
rom OPT
I
ONS_
S
PEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
M
i
klo
s
Vajna
git-fast-import: rename cmd_*() functions to parse_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INSTAL
L
: add a no
t
e about GNU interact
i
v
e tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
V
ajna
A
d
d
tests for s
e
ndemail
.
cc configuration variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mikl
o
s
V
aj
n
a
git
-
send-email: add a new sende
m
a
il
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
Vaj
n
a
g
i
t
-format-pa
t
ch:
a
d
d
a new format
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Mi
k
los Vajna
gi
t
c
h
eckout: add -t
alias for --
t
rack
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vajna
d
i
f
f o
p
tions d
o
c
umentation: ref
e
r to --diff-filt
e
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
ik
l
os
Vajna
contrib/hooks: add an example pre-
a
uto-gc h
o
ok
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
iklos Vajna
Document
a
ti
o
n/hooks: add pre-auto-gc
h
ook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
o
s Vajna
g
i
t
-
gc --auto
:
a
dd pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
M
i
klos V
a
jna
Docume
n
tatio
n
/
git-
m
erge: document subtree s
t
r
a
tegy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Mi
k
l
os Vajn
a
git-gui: Updated
Hungarian translation (e5fba18)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos
V
a
j
na
Up
d
ate Hungarian t
r
anslation
.
100% completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
Impro
v
e t6029 t
o
c
h
ec
k
t
he real
"subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Mikl
o
s
V
a
jna
Docume
n
tation/git svn lo
g
: add a not
e
abo
u
t timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Mi
k
los Vajn
a
Documen
t
ation/gi
t
-fil
t
er-br
a
nch: add a new msg-
f
ilter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos
V
a
jna
git-
c
l
ean: handle errors
i
f remo
v
ing fil
e
s fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklo
s
Vajna
D
o
cumentati
o
n/gi
t
-stash: document opt
i
ons
for
g
it stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos Vajna
git clone -s documentatio
n
:
force a new parag
r
aph f
o
r
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklos Vajn
a
builtin-gc
.
c
:
gu
a
rd config parser from
va
l
ue=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Mi
k
l
o
s Vajna
git rev-parse manpage: spelling fi
x
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
M
i
klos Vajna
g
i
t
p
ull manpage: don't include -n from fetch-options
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next