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
Mik
l
o
s
Vajna
Cleanup in
sha1_file
.
c:
:
cache_or_un
p
ack_ent
r
y()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
V
ajna
t760
3
: add new testcases
to ensu
r
e bu
i
lt
i
n-c
o
m
m
it uses
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
builtin-
c
o
mmit:
use
c
ommit_tree()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
commit
_
t
r
ee(): a
d
d a
n
e
w
a
u
t
hor parameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
Vajna
t7501: always 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-merge: releas
e
the lockfile in tr
y
_
merge_strategy()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merge-recurs
i
ve: ge
t
rid of virtual_id
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Vajna
merg
e
-recurs
i
ve:
move curren
t
_{file,directory}_set
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Miklos Va
j
na
me
r
g
e
-recursive: mo
v
e the glo
b
al obuf to struct
m
erge
_
options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
os Va
j
na
merge-
r
ecursive: get r
i
d
o
f
t
he index_onl
y
global varia
b
le
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-04
M
iklos Va
j
n
a
merg
e
-
r
ecursive: move cal
l
_depth
t
o struct me
r
ge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
Makefile: add merg
e
_recursive
.
h to LIB_H
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
M
ikl
o
s Vaj
n
a
cherry-pick/rev
e
rt: make direct internal call t
o
merge_tree
(
)
commit
|
commitdiff
|
tree
2008-08-31
Miklos
Vajna
builti
n
-
merge: avoid run_com
m
and_v_opt() for recursive
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
Vajna
merge-recursiv
e
: introduce merge_
o
ptions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
Split out merg
e
_recursive() to
m
e
r
ge-recursive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Mi
k
los
V
aj
n
a
M
akefile:
e
nable
S
NPRI
N
TF
_
RET
U
RNS_BOGU
S
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 Vajn
a
t
9
300: replace '!' with
t
e
s
t_must_f
a
il
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Miklos
V
aj
n
a
D
o
cume
n
ta
t
ion: doc
u
m
e
nt the pager
.
*
configuration
setting
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
M
ikl
o
s Vajna
Builtin
g
it
-
help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Mi
k
los Vajna
builtin-help: al
w
ays load_c
o
mman
d
_list() in cmd_he
l
p()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Va
j
na
Add a second testca
s
e for hand
l
ing inva
l
id strategies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
V
ajna
Add a
n
e
w
t
est for
using
a
c
ustom merge st
r
ategy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
built
i
n-me
r
ge:
a
llow using a custom str
a
tegy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin-
h
elp: make some internal function
s
a
v
a
i
lable
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Va
j
na
t7601: extend the 'merge picks up the best result'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
M
i
kl
o
s Vajn
a
builti
n
-merge
:
giv
e
a
prope
r
error
message
for i
n
valid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
Teach 'git
m
erge' that some m
e
rge strategie
s
no longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add a new test for git-merge-resol
v
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Mik
l
o
s
V
aj
n
a
t
6021: add a new test fo
r
git
-
mer
g
e-resolve
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
m
a
k
e
remove-das
h
es
:
apply to scrip
t
s and progr
a
ms as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os
V
ajna
g
it-bis
e
ct: us
e
dash-less
f
o
rm on git bisect log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-hash-obje
c
t
.
sh: us
e
quot
e
s for the test de
s
cript
i
on
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Mik
l
os Vajna
t0001-init
.
s
h
:
change confusing dire
c
t
ory
n
ame
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Mikl
o
s Vajna
Build in merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fi
x
t760
1
-merge-pull-config
.
sh on AIX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klo
s
Vajn
a
git-commit-tree: m
a
ke
it usable from other builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Add new test case t
o
e
n
sure
g
i
t
-mer
g
e
pr
e
pe
n
ds the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
h
g
-to-git: use
git i
n
it in
s
tead
of git in
i
t-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
hg-to-git: rewrite
"
git-frotz" to "gi
t
frotz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
iklos Vajna
hg-to-git: abort if th
e
proj
e
ct
d
irec
t
ory is
not a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos V
a
jna
hg-to-git: avoid raising a string exception
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
M
i
k
los Vajn
a
I
N
S
TALL:
Update sec
t
ion about git
-
fr
o
t
z
form
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
M
i
klos
Vajna
Retire 'stupid'
m
erge
strategy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add n
e
w te
s
t case to ensure
git
-
merge reduces
octopus
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
l
os Vajna
A
d
d ne
w
t
e
st to ensure
g
it-
m
erg
e
handles m
o
re than
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Introduce get_octop
u
s
_
merge_bases() in com
m
it
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-fmt-mer
g
e-m
s
g: make it
usable from o
t
her bu
i
ltins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move read
_
c
a
c
he_unmerged()
to
r
ead-c
a
che
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Add new test
to en
s
ur
e
git-me
r
ge hand
l
es p
u
l
l
.
twohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
Move pars
e
-options's skip_prefix
(
)
t
o
git-
c
ompat-util
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
Mo
v
e co
m
m
it
_
list_count()
t
o comm
i
t
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
ikl
o
s Vajna
Move
sp
l
it_cmdline() to al
i
as
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajn
a
path-list
docu
m
ent
a
ti
o
n: document all functions and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajna
run-c
o
mm
a
n
d
documen
t
ation: f
i
x "
m
e
mset()" parameter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-read-tre
e
:
d
o
cument -v opt
i
on
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mik
l
os Vajna
A simple script
t
o parse the results f
r
om the testc
a
ses
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
g
i
t
-re
b
ase
-
i:
m
ention the short command alia
s
es i
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajn
a
Remove
u
n
u
s
e
d
cod
e
in
p
arse_commit_buffer()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklo
s
Vajna
Str
b
uf documentation: do
c
um
e
nt mos
t
f
unctions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
R
e
visi
o
n
walkin
g
d
o
c
ument
a
tion: d
o
c
u
m
e
nt most i
m
portant
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vajna
C
o
din
g
G
uidelin
e
s: Add a
n
o
te to avo
i
d assig
n
m
ents inside
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vaj
n
a
git-merge: ex
c
lude
u
nn
e
c
e
ssary options from OPTIONS_SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Miklos
Vajna
g
it-f
a
s
t
-imp
o
rt: rena
m
e
c
md_*() functions to par
s
e_*()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Mi
k
los
Vajna
IN
S
TALL:
a
dd a note ab
o
ut GNU inte
r
active tools ha
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Mik
l
o
s
Va
j
n
a
Add t
e
sts for se
n
d
email
.
cc configu
r
ati
o
n
va
r
iable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
M
i
klo
s
Vajna
g
it
-
send-email
:
add
a new sen
d
ema
i
l
.
cc c
o
nfiguration
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
gi
t
-format-patch: add a new format
.
cc configuratio
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Mikl
o
s Vajna
git c
h
eckout:
a
dd -t a
l
ias for --tr
a
ck
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
Miklos Vajna
diff
o
pti
o
n
s d
o
cumentatio
n
:
r
e
f
e
r to --
d
iff-filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Mi
k
los V
a
jna
contrib/hook
s
: add
an example p
r
e-auto-gc ho
o
k
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
D
o
cumentation/hoo
k
s
: add
pre-aut
o
-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
git-gc --auto: a
d
d pre-auto-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajn
a
D
ocumentation/git-merge: d
o
c
u
ment
s
ubtre
e
s
trate
g
y
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Miklos Vajna
git-gui:
U
pda
t
e
d
H
un
g
ar
i
an translat
i
on (e5fba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Mikl
o
s
Vaj
n
a
Up
d
ate Hungaria
n
translation
.
100%
completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vaj
n
a
Improve
t6029
to check the real "subtr
e
e"
ca
s
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Mik
l
os Vajna
Documentation/git svn l
o
g:
add a note about
timezo
n
es
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
Mikl
o
s
Vajna
Documentation/git-
f
ilt
e
r-branch: add a new
m
s
g-f
i
lter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
M
ikl
o
s
V
a
jna
g
it-
c
lean: handle errors if remo
v
in
g
files fails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
M
i
klos
V
aj
n
a
Docume
n
tation/gi
t
-stash: docu
m
e
n
t options for git stash
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
Mikl
o
s
Vajna
git clone -s documentati
o
n: force a
n
ew
p
aragraph for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Mi
k
los Vajna
b
u
i
l
tin-g
c
.
c: guard c
o
nfig parser from valu
e
=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Mik
l
os Vajn
a
gi
t
rev-parse man
p
a
ge: spelling fix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Mi
k
los Vajna
git pull manpage: d
o
n't
i
ncl
u
de -n from fet
c
h
-
options
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Miklos V
a
jna
gi
t
-
clone -s: docu
m
e
nt proble
m
s w
i
t
h
git gc
-
-
prune
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vajna
In
c
lud
e
re
v
-list
o
ptions in git-log manpage
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
M
iklos Va
j
na
l
s-remote: add -t an
d
-h options
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
Miklos Vajna
A
dd
u
sing merge subtree How-To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajna
t/t7001:
a
void unn
e
cess
a
ry ER
E
when using
g
rep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git-sh-setu
p
: document git_editor(
)
an
d
get_auth
o
r_id
e
nt_
f
ro
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
Mi
k
los Vajna
eve
r
yday: replac
e
'
p
rune' and 'r
e
pac
k
' with 'gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos
V
ajna
U
p
d
a
t
e Hungarian translatio
n
.
100% comp
l
eted
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklo
s
V
ajna
In
c
l
ude
d
i
ff options in th
e
git-log manp
a
ge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vaj
n
a
git-send-email: add a new sendemail
.
t
o configura
t
ion
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
Miklos
V
ajna
git stash: document
a
p
ply's --
i
ndex switch
commit
|
commitdiff
|
tree
2007-09-29
Miklos V
a
jna
git-bund
l
e: fix comma
n
d
lin
e
examples in the ma
n
p
age
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Mikl
o
s Vajna
User M
a
nual: ad
d
a
c
h
apter f
o
r submodules
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
Mikl
o
s Vajna
Hungar
i
an
translat
i
on of git-gui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
next