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
Cl
e
a
n
u
p in s
h
a1_
f
ile
.
c::cach
e
_or_unp
a
ck
_
entry()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
t7603: add new testca
s
es t
o
ensure builtin-commit uses
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos Vajna
builtin-commit: us
e
c
o
mmit_tree()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklo
s
Vaj
n
a
commit_tree():
a
dd
a new auth
o
r parameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-10
Miklos V
a
jna
t
7501: a
l
ways use
test_cmp instead of
d
i
f
f
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-07
Mi
k
los Vajna
builtin-merge:
r
e
le
a
s
e the lockfile in try_merge_str
a
tegy()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mi
k
los Vajna
merge-recur
s
ive: g
e
t rid of virtual_id
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Mik
l
os Va
j
na
merge
-
recursive:
move current_{fil
e
,directory}_set
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
Miklos
Vajna
merge-recu
r
s
i
ve: move
t
he global obuf
t
o struct merge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-05
M
iklos Vajna
m
erg
e
-
r
ecursive: get rid of
th
e
index_only global vari
a
ble
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-04
Mi
k
los Vajna
merge-recursive:
move call_de
p
th to struct m
e
rge_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
Miklos Vajna
M
a
kefile: add merge_re
c
ursive
.
h to LIB_H
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-09-03
M
i
k
l
o
s
V
aj
n
a
cherry-p
i
c
k
/rev
e
r
t
: make
d
ire
c
t
i
nternal c
a
ll to merge_t
r
ee()
commit
|
commitdiff
|
tree
2008-08-31
Miklos
V
ajna
builtin-merge: avo
i
d
ru
n
_com
m
and
_
v_op
t
() for
r
ecu
r
sive
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
Miklos V
a
jn
a
merge-re
c
ursiv
e
:
introduce merg
e
_options
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-31
M
i
klos Vajna
Split out merge_recur
s
ive() to merg
e
-recurs
i
v
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-24
Miklo
s
Vajn
a
Makefile: ena
b
le SNPRINTF_RETUR
N
S
_BO
G
US for HP-
U
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-22
M
iklos V
a
jn
a
Fix 'git help help
'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-17
M
ikl
o
s Va
j
na
t9300: r
e
plac
e
'!'
w
ith test_must_fail
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-16
Miklos
V
ajna
D
ocumentat
i
o
n: docu
m
ent the pager
.
*
configuration setting
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-08-03
M
iklos Va
j
na
Builtin git-
h
el
p
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-31
Miklos Vajna
b
u
iltin-help
:
always load_command
_
l
i
s
t()
in
c
m
d_help()
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los Vajna
A
d
d a second t
e
stcase
f
or handling
inv
a
lid strate
g
ies
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
k
l
os Vaj
n
a
Ad
d
a new
t
est for u
s
i
n
g a custo
m
merge strate
g
y
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
Miklos Vajna
builtin-merge: allow using a custom
s
trategy
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-30
M
i
klos Vajna
builtin-help: m
a
ke some intern
a
l
f
u
nct
i
o
n
s available
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-23
Miklos Vajna
t76
0
1
: extend the 'me
r
ge pi
c
ks up the be
s
t res
u
lt'
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-22
Miklos Va
j
na
builtin-merge: give
a
proper
error message f
o
r invalid
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-20
Miklos Vajna
T
e
ach 'git merge' that some mer
g
e strate
g
ies no longer
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Va
j
na
A
dd
a
new test for git
-
me
r
ge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-13
Miklo
s
Vajna
t602
1
: ad
d
a new test fo
r
git-me
r
ge-resolve
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Va
j
na
make r
e
move-dashes: apply to script
s
a
nd program
s
as
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Vajna
g
i
t-bisect: use das
h
-l
e
s
s
form on git bisect
l
o
g
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1
0
07
-
hash-o
b
ject
.
sh: use quotes for
t
he test
d
es
c
ription
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
Vajn
a
t000
1
-in
i
t
.
sh: chan
g
e con
f
u
s
i
ng direc
t
o
r
y name
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-08
Mik
l
o
s
Vajna
B
uil
d
in merge
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mikl
o
s Vajna
Fix t760
1
-
merge
-
pull-c
o
nfig
.
sh on A
I
X
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
l
os Vajna
git
-
commit-tr
e
e: make it us
a
ble from othe
r
builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-07
M
i
klos Va
j
na
A
d
d
n
e
w t
e
s
t case to ensur
e
git-merge prep
e
n
d
s the
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
M
i
klos
Vajna
hg-to-git: use git in
i
t inste
a
d of git
init-db
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mikl
o
s Vajna
hg-to-git: rew
r
ite "git-frotz"
t
o
"git frotz"
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Mi
k
l
o
s
Vajna
hg-t
o
-git:
a
bort if the project directory is not a
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
Vajna
h
g
-t
o
-git: a
v
oi
d
raising a stri
n
g except
i
on
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vaj
n
a
I
NSTALL
:
Up
d
ate sectio
n
about
g
i
t
-frotz form
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-05
Miklos Vajna
Ret
i
re
'
stupid' merg
e
stra
t
egy
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
A
dd new test case to ensure git-merg
e
reduces
o
ctopus
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
os Vajna
Ad
d
new test t
o
en
s
ur
e
gi
t
-merge handles m
o
re
th
a
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
Vajna
I
ntroduc
e
get
_
oct
o
pus_merge_bases() in commit
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
git-fmt-merge-msg: make it usable from other builtins
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move read
_
cache
_
unmerged() to re
a
d
-
c
a
c
h
e
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mi
k
los Vajna
Add new tes
t
to ensure git-merge handle
s
pull
.
tw
o
head
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Mikl
o
s Vajna
Mov
e
par
s
e-
o
ptions
'
s skip_prefi
x
()
to git-compa
t
-util
.
h
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Va
j
n
a
M
o
ve comm
i
t_list_count()
to comm
i
t
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move split_cmdline() to alias
.
c
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
Miklos Vajn
a
path-list docu
m
entati
o
n: d
o
cum
e
n
t
all functi
o
ns and
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-17
M
i
k
l
os
V
ajna
run-command documentation
:
fix "m
e
ms
e
t()" p
a
rameter
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-read
-
tree: d
o
cument -v option
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A sim
p
le script to
parse the
r
esu
l
ts from the testcases
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vaj
n
a
git-rebase -i: mention the short
comm
a
n
d aliases in
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-08
M
i
klos
Vajna
R
e
mov
e
u
nused cod
e
in parse_comm
i
t_buf
f
e
r
(
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-06-04
Mi
k
los Va
j
na
Strbu
f
d
o
cumentat
i
on:
document
m
ost functions
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-31
Miklos Vajna
R
e
vision walking documenta
t
ion: document most imp
o
r
tant
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-25
Miklos Vaj
n
a
CodingGuidelines: Ad
d
a note to avo
i
d
assignments insid
e
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-21
Miklos Vajna
git-merge: exclude unnece
s
sary
o
ptions from O
P
TION
S
_SPEC
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-05-16
Miklos 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
INS
T
ALL:
add a note about GN
U
i
n
tera
c
t
ive tools has
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
Vajna
Add tests for
s
endema
i
l
.
cc
c
o
n
figur
a
t
i
on variable
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
V
ajna
g
it-
s
end-e
m
ail: add a new s
e
ndemail
.
cc con
f
iguratio
n
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vaj
n
a
git-format-patch: add a new format
.
cc
c
o
nfigur
a
tion
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-27
M
iklos Vajna
git checkout:
a
d
d -t alias for --tr
a
c
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-23
Mik
l
os Vajna
diff o
p
t
i
o
n
s docu
m
entation: r
e
fer to --
d
i
f
f-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
V
ajn
a
contri
b
/hoo
k
s:
a
dd an example pre-
a
uto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklos V
a
jna
Documentation/
h
ooks: add pre-auto-gc hook
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-04-09
Miklo
s
Vajna
git-gc --auto: add pre-auto-
g
c ho
o
k
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vaj
n
a
Documentati
o
n/git-me
r
ge
:
docume
n
t
s
ubt
r
ee strategy
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-15
Miklos
Va
j
n
a
g
i
t
-gui
:
Updated Hung
a
r
ian translation (e5fba1
8
)
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-03-13
Miklos
V
ajna
Update Hungarian translation
.
100%
completed
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajn
a
I
m
pr
o
ve t6029
t
o
c
heck the real "subtree"
case
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-27
Miklos Vajna
Documentat
i
o
n
/
gi
t
svn log: add a note a
b
out timezones
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-25
Miklos Vajna
Documenta
t
ion/gi
t
-filter-br
a
nch: add a new
msg-filter
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-21
Mikl
o
s Vajna
git-clean: handle
e
rrors if rem
o
ving files fails
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-20
Mi
k
l
os Vajna
Documen
t
ation/git-stash: document opti
o
n
s
f
or git stash
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-13
M
i
klos Va
j
na
git clo
n
e -s
documentation: force
a
n
ew
p
a
ragraph for
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-02-11
Miklo
s
Vajna
built
i
n-gc
.
c: guar
d
confi
g
pa
r
ser fr
o
m value=NULL
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-31
Miklos Vajna
git
r
ev-p
a
rs
e
manp
a
g
e
:
s
pelling fix
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vajna
git pull manpage: don't include -n from f
e
tch-options
.
tx
t
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-23
Miklos V
a
jna
git-
c
lone -s:
do
c
ument pr
o
blems wi
t
h git g
c
-
-
prun
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-18
Miklos Vajna
Include rev-
l
ist options in git-log
m
anpage
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-16
M
iklos Vajna
ls-re
m
ote: add
-t and -
h
opt
i
ons
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-15
Miklo
s
Vajna
A
dd usin
g
merge subtr
e
e How
-
To
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2008-01-05
Mik
l
os
V
a
j
na
t/t7
0
01:
avoid unn
e
cessary
E
RE when using gr
e
p
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-29
Miklos Vajna
git-sh-
s
etup: d
o
cum
e
nt git_e
d
itor()
a
nd get_author_ident
_
fro
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-21
Miklo
s
Vajna
everyday: replace 'prune' and
'
repack' with
'gc'
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
M
iklo
s
Vajna
Update
H
u
n
ga
r
ian translati
o
n
.
100%
c
ompleted
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-12-05
Mikl
o
s Vajna
Include
d
i
f
f options in the
g
i
t
-
l
o
g ma
n
pag
e
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-25
Miklos
Vajna
gi
t
-send-
e
ma
i
l
:
add a new sendem
a
i
l
.
to c
o
nfigurat
i
on
.
.
.
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-10-01
Miklos
V
ajna
git stas
h
: do
c
ume
n
t apply's --index switc
h
commit
|
commitdiff
|
tree
2007-09-29
Miklo
s
Vajn
a
git-
b
u
n
d
l
e:
fi
x
comm
a
ndline exa
m
p
l
es in th
e
manpage
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-23
Miklos
Vajna
User Manual: add a chapter for sub
m
odules
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
2007-09-02
Mikl
o
s
V
a
jna
Hungarian transla
t
io
n
of
git-gui
Signed-off-by:
Miklos Vajna
<vmiklos@frugalware.org>
commit
|
commitdiff
|
tree
next