repo.or.cz
/
git
/
spearce.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Cleanup in sha1_file.c::cache_or_unpack_entry()
2008-10-09
Miklos
V
a
jna
Clea
n
up in sha1_
f
ile
.
c::cache_or_unpack_entry()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos V
a
jna
t7603: a
d
d new testcases to ensure builtin-co
m
mit uses
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
b
u
i
ltin
-
co
m
mit: use
c
ommit_tree()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
M
i
klos Vajna
c
ommi
t
_t
r
ee
(
): add a new auth
o
r
p
ara
m
e
t
er
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos
Vaj
n
a
t7501: always use test
_
cmp
i
nstead of d
i
ff
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-07
Mik
l
os Vajna
bu
i
ltin-merge: release the lockfile
in try_merge_strategy()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
los Vajn
a
merge-recursi
v
e: get r
i
d
of virtual_id
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
me
r
ge-re
c
ursive:
m
ove
c
ur
r
ent_{file,dir
e
ctory}_s
e
t
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
m
e
rge-rec
u
rsive
:
move
t
he
g
lobal ob
u
f t
o
st
r
u
c
t
merge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
M
i
k
l
o
s
V
ajna
m
e
rge-recurs
i
ve: g
e
t rid of the
index_
o
nly global variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Va
j
na
merge-recursive: mov
e
c
al
l
_dep
t
h
to struct merg
e
_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
Makefile: add merge_
r
ecursive
.
h
to LIB_H
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Mikl
o
s Vajna
c
h
erry-pic
k
/revert: m
a
ke dire
c
t inte
r
nal call to m
e
rge_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos
Va
j
n
a
b
uiltin-merge: avo
i
d r
u
n_comm
a
nd_v_opt() for recursive
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
os Va
j
na
m
e
r
ge-rec
u
r
s
i
ve: introduce merge_option
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklo
s
Vajna
Split out merge
_
r
ecursi
v
e
() to merge-recursive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Mikl
o
s Vajna
Make
f
ile: enabl
e
SN
P
RINTF_R
E
TURNS_BOGUS for HP-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Va
j
na
Fix 'git help he
l
p'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
M
iklos
V
a
jna
t9300: rep
l
ace
'
!
' with
t
e
st_must_
f
ai
l
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Miklos Vaj
n
a
Docu
m
entatio
n
:
document
t
he p
a
g
e
r
.
* confi
g
uration setting
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Miklos V
a
jna
Buil
t
in
git-h
e
lp
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Mikl
o
s Va
j
na
builtin
-
help: al
w
ays load_command_list()
in cmd_help()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
Add
a
second tes
t
ca
s
e
for handling invalid strategies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos 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
Miklos Vaj
n
a
builtin-me
r
g
e
: al
l
o
w
using a cust
o
m
strategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Vajn
a
buil
t
in-he
l
p
: make so
m
e
int
e
r
n
al functions availabl
e
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t760
1
: e
x
tend the
'
merge
p
icks up
the best re
s
ult'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Vajna
built
i
n
-merge: g
i
ve a proper error message f
o
r invalid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Mi
k
l
os
V
a
j
na
Teach 'git mer
g
e
'
that
some merg
e
strategies no
long
e
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Mikl
o
s Va
j
na
A
dd a ne
w
test for gi
t
-mer
g
e
-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos
Vajn
a
t
6
02
1
:
add a new
t
e
st for git-merge-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
make remove-das
h
es: apply to scripts and programs as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mikl
o
s Vajna
git-
b
isect: use dash-less form on git bisect log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
na
t1
0
0
7-h
a
sh-obje
c
t
.
sh: use quotes for the t
e
st
description
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t
0
001-init
.
sh: chang
e
conf
u
sing d
i
rector
y
name
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Mikl
o
s V
a
j
n
a
Build
i
n merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s V
a
jna
Fix t7601-merge-pull-config
.
sh on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s
V
ajna
git-com
m
it-tree:
ma
k
e it usable
f
rom o
t
her builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add ne
w
test case to ensure
g
it-merge prepends
t
he
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
hg-to-git: use git init instead of git init-d
b
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Va
j
na
h
g-to-git:
r
e
write "git-frotz"
t
o
"git fr
o
tz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mik
l
os Vajna
hg-to-gi
t
: abo
r
t i
f
the project
direct
o
ry
i
s not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
los
V
aj
n
a
hg-
t
o-git: avoid raising a stri
n
g except
i
o
n
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
INSTA
L
L
: Upda
t
e section about git-frotz for
m
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Retire 'stupid
'
merge strategy
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajn
a
Add new test
ca
s
e to ens
u
re
git-merge
reduces octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new te
s
t
to
e
nsure git-me
r
ge h
a
ndles
m
ore
tha
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Introduce get
_
o
ct
o
pus_mer
g
e
_
b
ases() in commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
l
os V
a
jna
git-f
m
t-merge-m
s
g: ma
k
e it
u
sable
f
r
o
m other bui
l
tins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move read_ca
c
h
e
_unm
e
rged() to read-
c
a
che
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos
V
ajna
Add
new tes
t
t
o
e
n
s
ure
git-merge handles pull
.
t
w
ohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
M
o
ve parse-opt
i
ons's s
k
ip_prefix
(
) to
git-compat-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
Move commi
t
_
l
i
s
t_cou
n
t() to co
m
mi
t
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajn
a
Mo
v
e spl
i
t_
c
mdline() to ali
a
s
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
M
iklo
s
Vajna
path-list documen
t
atio
n
: document al
l
functions and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos
V
a
j
na
run-comma
n
d
documentatio
n
:
fix "memset()" parameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
g
it-
r
ead-tree: document -v option
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklo
s
Vajna
A
simple script to p
a
rse
t
h
e resu
l
t
s
f
rom the testcases
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mi
k
los
V
ajna
g
i
t-rebase -i: mention
the shor
t
command aliases in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos
V
ajna
Remo
v
e u
n
us
e
d code
i
n parse_commit_buffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
Strb
u
f doc
u
mentation
:
d
oc
u
ment most functions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Mikl
o
s Vaj
n
a
Revisi
o
n walki
n
g docu
m
entation
:
docum
e
nt most important
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajna
CodingGu
i
delines:
A
d
d
a note to av
o
id assignments in
s
ide
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
git-merge: exclude unnecessary options fr
o
m OPTIONS
_
SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Mikl
o
s
V
ajna
git-fast-impor
t
: re
n
ame cmd_*() fu
n
ctio
n
s to parse_
*
()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
INS
T
ALL: add a n
o
te abou
t
GNU interacti
v
e too
l
s has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
os Vajna
Add tests for sendem
a
il
.
cc configurat
i
on variable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
git-send-
e
m
ail: a
d
d a
n
e
w sendemail
.
cc co
n
figur
a
tion
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
M
ikl
o
s
Vajna
git-format-patch: add a
new format
.
cc configuration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklos V
a
j
n
a
g
it checkout:
add -t a
l
i
a
s fo
r
-
-
track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
M
i
klos Vajna
diff opt
i
ons do
c
ument
a
tion: refer to --diff-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
co
n
trib/hooks: add
an exampl
e
pre-auto-g
c
ho
o
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
Vajna
Documentation/hook
s
: add pre-aut
o
-gc h
o
ok
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Mik
l
o
s Vajna
g
it-gc --
a
uto: add pre-auto-
g
c hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajn
a
Documentation/git
-
merge: d
o
c
u
me
n
t sub
t
ree strategy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Mik
l
os Vajn
a
g
i
t-gui: Updated
H
u
ngarian translati
o
n (e5fb
a
1
8
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Miklos
Vajna
Update Hun
g
aria
n
translation
.
100% c
o
mpleted
.
commit
|
commitdiff
|
tree
2008-02-29
Mikl
o
s Vajna
Improve t6029
to
c
heck the real "
s
ubtree" ca
s
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vaj
n
a
Docu
m
entation/g
i
t svn
l
og: a
d
d a note about timezon
e
s
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Miklos
Vajna
D
ocumenta
t
ion/git
-
filter-branch: add
a new m
s
g-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Mikl
o
s
V
aj
n
a
git-cl
e
an: handle e
r
rors if removing fi
l
es fail
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
Mi
k
los
V
ajna
Doc
u
m
ent
a
tion/git-stash: document options for git stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
M
i
k
l
o
s
Vajna
g
i
t clone
-s d
o
cum
e
ntation: force a new para
g
raph f
o
r
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
M
i
k
los Vajna
b
u
i
l
ti
n
-gc
.
c: guard c
o
nfig par
s
er f
r
om value=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Mik
l
os Vajna
git rev-par
s
e manpage: spelling f
i
x
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
git pull manpa
g
e
: d
o
n't inc
l
ude -n
f
r
o
m fetch-opti
o
ns
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
gi
t
-clone -s: document problems wit
h
git g
c
-
-
p
rune
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
M
i
k
los V
a
jna
Include rev-list opti
o
ns in git-log manpage
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Miklos Vajna
ls
-
r
e
mote: a
d
d -t and -h options
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
Mik
l
os Vajna
Add
u
s
ing merge s
u
b
tree How
-
To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
M
i
klos Vajna
t/
t
7001: avoid unnecessary ERE when using grep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git-
s
h-s
e
tu
p
: document git_edito
r
() and get_author
_
ident_fro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
Miklo
s
Vajna
everyda
y
:
r
eplace 'p
r
une' and 'repa
c
k' with 'gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
U
pdate Hungar
i
an tra
n
slation
.
1
0
0% com
p
le
t
ed
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Include
diff options in the git-l
o
g manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vajna
git-send-em
a
il:
add
a
new se
n
demail
.
to
conf
i
guration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajna
git s
t
ash: documen
t
apply
'
s
--in
d
ex switch
commit
|
commitdiff
|
tree
2007-09-29
Miklo
s
Vaj
n
a
g
it-bundle:
f
ix comma
n
dline examples in the m
a
npage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Miklos Vaj
n
a
User Manual: add a chapter for subm
o
d
u
l
es
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
M
iklo
s
Vajna
Hungaria
n
translation of git
-
gui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
next