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
Cleanup in sha1_file.c::cache_or_unpack_entry()
2008-10-09
Miklos Vajna
Cleanup in
s
ha1_file
.
c::
c
ache_or_unpack_entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Mi
k
los Vajna
t760
3
: ad
d
new testcases to ensure builtin-commit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos V
a
jna
bu
i
ltin
-
commit: u
s
e commit_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
commit_tree(
)
: add
a
ne
w
author pa
r
a
meter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
Vajna
t7501: always
use test
_
c
m
p i
n
stead of
diff
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Miklos Vajna
builtin-merge: re
l
ease the lockfile in
try_
m
erge_
s
tr
a
t
e
gy
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
i
k
lo
s
Vajna
merge-recurs
i
ve: get rid of vi
r
t
u
a
l_i
d
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos
V
ajna
merge-r
e
cursive: move current_{file,directory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mikl
o
s Vajna
merge-recursive: move
t
he global o
b
uf to s
t
ruct m
e
rge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merg
e
-recursive: g
e
t rid of the index_only glo
b
al variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Mikl
o
s Vajna
m
e
rge-recurs
i
ve: move call_depth to struct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
i
klos Vajna
M
a
k
e
file:
a
dd mer
g
e
_
recu
r
sive
.
h to LIB
_
H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Mi
k
l
os
V
aj
n
a
cherry
-
pick/revert: make direct inte
r
na
l
c
a
ll to m
e
rg
e
_tree()
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
builtin-
m
erge: a
v
oid run_command_v_op
t
() for
recurs
i
ve
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
merge-
r
ecursive: introduce merg
e
_
o
ptions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Va
j
na
S
plit
out me
r
ge_recursive() to merge-recursive
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Vajna
Makefile: ena
b
le S
N
PR
I
N
T
F_R
E
TURNS_BOGUS for
H
P-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
Mik
l
os
V
ajna
t9300: rep
l
ace '!' with test_
m
ust_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Mikl
o
s V
a
jna
Documenta
t
i
on: documen
t
the pa
g
er
.
* confi
g
urat
i
on
setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
Mikl
o
s Vajna
B
uiltin git-he
l
p
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
b
uiltin-help:
always load_command_list() in cmd_hel
p
()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Vajna
A
dd
a
second testc
a
se for handling
i
n
va
l
id strategie
s
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
V
aj
n
a
A
dd a new test for using
a c
u
stom
m
e
rge stra
t
egy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vaj
n
a
bu
i
lti
n
-merge: allow usi
n
g a custom
s
trategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
iklos Vajna
b
u
iltin-hel
p
: make some internal function
s
available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Va
j
na
t7601: ext
e
n
d
the 'merg
e
pick
s
up t
h
e
b
es
t
result'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklo
s
Vajna
builtin-merge
:
gi
v
e a proper error messa
g
e
f
o
r
inv
a
lid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos
Vajna
Teach 'g
i
t merge' t
h
at some merge strategies no lo
n
ger
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklo
s
V
a
jna
Ad
d
a new test for git
-
merge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Mik
l
o
s Vajna
t6021: a
d
d a
new test for g
i
t-merge-resolv
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
V
a
j
na
mak
e
r
e
move-d
a
shes: apply to s
c
ripts and
p
r
ograms
as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
Va
j
na
git-bi
s
ect: us
e
dash-l
e
ss form on git bisec
t
log
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-hash-ob
j
ect
.
sh: u
s
e quotes f
o
r
the test descript
i
on
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
M
i
k
l
o
s Vajna
t
0
0
01-in
i
t
.
sh: cha
n
ge confusing direc
t
ory name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Build in mer
g
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
l
o
s Vajna
Fix t7601
-
merge-pull-c
o
nfig
.
s
h o
n
AIX
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vaj
n
a
git-commit-tree:
make it
usable from other
b
u
iltins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add new test case to ensure git-me
r
g
e
p
repends the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-g
i
t: use g
i
t in
i
t
instead of git ini
t
-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
a
jna
hg
-
to-git: rewrite "git-f
r
otz" to "git
frot
z
"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
h
g-t
o
-git: abort if the
p
rojec
t
directory is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: avo
i
d raising a
string
exception
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vajna
INST
A
LL: Updat
e
sec
t
ion abo
u
t git-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Retire '
s
t
u
p
i
d' merge
s
tr
a
tegy
commit
|
commitdiff
|
tree
2008-07-01
M
i
klos Vajna
A
d
d new
test
c
ase
to en
s
ure gi
t
-me
r
ge
reduces octopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add
ne
w
test to ensur
e
git-
m
er
g
e handles more than
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Introduce
g
e
t_
o
ctopus_m
e
rge_b
a
ses(
)
i
n commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
iklos Vajna
git-fmt-merge-msg: make it usa
b
le from other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
M
ov
e
re
a
d_cach
e
_unmerged() to r
e
ad-cach
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
l
os
Vaj
n
a
Add new test
t
o en
s
u
re git-merge hand
l
es pull
.
t
wohead
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
o
s
Vajna
Move parse-options's s
k
ip_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_co
u
nt() to commi
t
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
M
ik
l
o
s
V
aj
n
a
Move split_cmdline() to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
path
-
list documenta
t
ion
:
document all fu
n
ctio
n
s
and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vaj
n
a
run-c
o
mman
d
docum
e
ntation: fix "memset()" p
a
rameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
M
i
klos Vajna
g
i
t-re
a
d-
t
r
ee: document
-v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Mikl
o
s Vajna
A simple scr
i
pt to parse th
e
resul
t
s
fro
m
the testcase
s
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajn
a
git
-
rebase -i: men
t
io
n
the short comm
a
nd
a
liases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
Remove
u
nus
e
d code in
p
arse_commit_buffer()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
Str
b
uf document
a
tion: doc
u
men
t
most functi
o
ns
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Mikl
o
s Vajn
a
Revi
s
ion wal
k
ing do
c
umentation: document
m
ost i
m
portant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Mik
l
o
s
Vajna
CodingGuidelines: Add a
n
o
te to avoid ass
i
g
n
men
t
s inside
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
M
iklos
V
aj
n
a
git-merge: exclud
e
unne
c
essary options from OP
T
I
O
NS_SP
E
C
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklo
s
V
a
jna
git-fa
s
t-import: r
e
na
m
e
c
md
_
*() functio
n
s
t
o par
s
e_*()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-05
Miklos Vajna
I
NSTALL: add a note about GNU
interactive
t
ools
has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
os Va
j
n
a
A
d
d
te
s
ts
for sendemail
.
cc configurati
o
n
v
ariable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
os
V
ajna
git-send-ema
i
l: a
d
d a new sendema
i
l
.
cc configuration
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
M
i
k
l
o
s V
a
j
na
git-format-patch: add a new fo
r
mat
.
cc
c
onfigu
r
at
i
on
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vajna
git checkou
t
: add -
t
alias
for --track
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vajna
diff o
p
tions documentation
:
refer to
--diff-fil
t
er
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
M
iklos
V
ajna
contrib/h
o
oks: a
d
d an example pre-aut
o
-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Mikl
o
s Vajna
Do
c
u
mentati
o
n/h
o
oks: add pre-au
t
o-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
git
-
g
c
-
-auto: add pre-auto-
g
c ho
o
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajn
a
D
oc
u
mentation/git
-
m
erge: document
subtre
e
s
tr
a
t
egy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
g
it-g
u
i: Updated Hun
g
arian
trans
l
a
tion (e5
f
ba18
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Mikl
o
s
V
ajna
Update Hung
a
rian transl
a
t
io
n
.
100
%
completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
I
m
prove t6029 to c
h
eck the real "subtree" case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajna
Documentatio
n
/git svn log: add a
n
ote abou
t
t
i
mezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Mikl
o
s Vajn
a
D
ocumentation
/
g
it-filt
e
r
-bran
c
h
:
a
d
d a new msg
-
filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
gi
t
-cl
e
an: handle er
r
o
rs if re
m
oving file
s
f
a
ils
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Miklos V
a
j
na
Docum
e
ntatio
n
/git-stash: document option
s
for git st
a
sh
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
Miklos
Va
j
na
git clone -s document
a
t
i
o
n: force 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
git rev-p
a
rse manpage:
spellin
g
fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
git pul
l
manpage: don't include -n from
f
etch-options
.
txt
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklo
s
Vajna
g
it
-
clone -s: documen
t
p
r
oblems with git gc --pru
n
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
M
i
klo
s
Vajna
Include
r
ev-list op
t
ions in
g
it-log manpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
Mik
l
o
s Vajna
ls-remote: add
-
t and -h options
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Mikl
o
s Vaj
n
a
A
dd using
m
erge su
b
tree
How
-
T
o
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Miklo
s
Vajna
t/t7
0
0
1: av
o
id
u
n
n
ecessary ERE w
h
en using grep
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Mi
k
l
os Vajna
git
-
sh-setup: d
o
c
u
ment git_editor() and
get_author_ident_f
r
o
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
everyday: re
p
la
c
e 'pr
u
ne' and 'repack' with
'
g
c'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Miklos Vajna
Update Hungarian transla
t
ion
.
100
%
co
m
pleted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
M
ikl
o
s
V
ajna
Include diff options in the git
-
l
o
g manp
a
ge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Miklos V
a
jn
a
git
-
send-email: a
d
d a new sende
m
ail
.
to c
o
nf
i
gurati
o
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajna
git stash: document
a
p
ply
'
s --index switch
commit
|
commitdiff
|
tree
2007-09-29
Miklo
s
Vaj
n
a
git-bundle: fix
commandline examp
l
es
in the manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
M
i
klos Vajna
User M
a
nua
l
: add a
c
h
apter for s
u
b
modules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
M
i
klos
V
ajna
Hungarian tran
s
lation of
g
it
-
gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next