repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: move the global obuf to struct merge_options
2008-09-05
M
i
klo
s
V
a
j
na
merge-recursiv
e
: move the global obuf to str
u
ct me
r
ge_opti
o
ns
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-05
M
i
klos Va
j
na
merge-recursive: ge
t
rid
o
f the index_only global
v
ariable
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-04
Miklos Vajn
a
merge-recursive:
move call_depth to struct m
e
r
g
e_option
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-09-03
M
i
k
los
V
ajna
c
herry-pick/revert: make
d
irect inter
n
al call to merge_tree(
)
commit
|
commitdiff
|
tree
2008-08-31
Mi
k
lo
s
Vajna
b
u
i
l
t
in-merg
e
: avoid r
u
n_command
_
v_opt()
for r
e
c
urs
i
ve
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos V
a
jna
merge-recursive: introduce merge_options
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-31
Miklos
V
a
j
n
a
Split out merge_recursive() to merg
e
-r
e
cursive
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-24
Mikl
o
s Vajna
M
akefile:
enable
S
N
PRINTF_R
E
T
URNS_B
O
GUS for HP-UX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-22
Miklos
Vajna
F
ix 'git help hel
p
'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-17
Miklo
s
Vajn
a
t9300: replace '!
'
with test_must_fail
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-16
Mik
l
os Vajna
Documentati
o
n: document the
p
ager
.
*
con
f
i
g
u
rat
i
on
set
t
ing
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-08-03
Miklos Vajna
Builtin git-help
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-31
Mik
l
os Vajna
builtin
-
h
e
lp: a
l
ways load_command_list() in cmd_hel
p
()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
M
iklo
s
Vaj
n
a
Add a second testcase for handl
i
ng
inva
l
id strategies
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Mi
k
los Vajna
A
d
d a new test f
o
r
using a
c
ustom m
e
rg
e
s
t
r
a
tegy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
Vajna
b
u
iltin-
m
erg
e
: allow u
s
ing a custom str
a
tegy
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-30
Miklos
Vajna
builtin
-
help: make some internal functi
o
ns availa
b
le
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-23
M
i
kl
o
s
V
a
j
na
t7
6
01: extend the 'merge picks up the
b
e
st
result'
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-22
M
i
klos Vajna
b
uiltin-merge: g
i
ve a prop
e
r
e
r
r
or me
s
sa
g
e for i
n
valid
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-20
Miklo
s
Vaj
n
a
Teach 'git me
r
ge' that some merge
s
trategies no longer
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
Add a
new
test
f
or git-merge-re
s
olv
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-13
Miklos Vajna
t6021: add a new test for
g
it-me
r
ge-resol
v
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklo
s
V
a
jna
m
ake remo
v
e-dash
e
s: app
l
y to
s
c
ripts a
n
d p
r
ogra
m
s as
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
git-bisect: use dash-les
s
form
o
n
g
it bisect log
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos Vajna
t1007-has
h
-
object
.
sh: use q
u
o
tes for the t
e
st de
s
c
ription
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-12
Miklos
Vajna
t
0001-ini
t
.
sh: c
h
ange confusing di
r
ector
y
name
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-08
Miklos Vajna
Build in merge
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
Fix
t
7601-merge-p
u
ll-config
.
s
h
on
A
IX
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Miklos Vajna
g
i
t-
c
ommit-
t
ree: make it
u
sable
fr
o
m other builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-07
Mi
k
los Vajn
a
Add new
test case to
e
nsure git-merge p
r
epends the
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajn
a
hg-t
o
-
g
it:
u
se
git
i
n
it instead
of git init-db
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to-git: rewrit
e
"git-frotz
"
to "git frotz"
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
a
j
na
h
g-to-git: abort if the project direc
t
ory is no
t
a
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos Vajna
hg-to
-
git: avoid raisin
g
a
st
r
i
n
g
exc
e
ption
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-06
Miklos
V
ajna
INSTALL: Update section about gi
t
-
f
rotz
fo
r
m
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-05
Miklo
s
Vajna
Re
t
ire 's
t
upi
d
'
m
erge s
t
r
ategy
commit
|
commitdiff
|
tree
2008-07-01
Mik
l
o
s
Vajna
Add new test case t
o
en
s
ure g
i
t-merge reduces octopu
s
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
i
k
l
os V
a
jna
Add new
t
e
s
t to
e
nsure git-
m
e
r
ge h
a
n
d
l
es more th
a
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos
V
ajna
Intr
o
duce ge
t
_o
c
topus_
m
erge_bases() in commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
M
ikl
o
s Vaj
n
a
g
i
t-fmt-
m
erg
e
-m
s
g: make it u
s
ab
l
e
f
r
om other
builtins
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move read_cac
h
e_unmerged() to
r
e
ad-cach
e
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Add new test to ensure git-m
e
rge h
a
ndl
e
s pull
.
t
wohead
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajn
a
Move p
a
rse-options's ski
p
_prefix() to git-compat-u
t
il
.
h
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move commit_list_count() to commit
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-07-01
Miklos Vajna
Move
s
plit_cmdline() to a
l
ias
.
c
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
Mik
l
os Vajna
path
-
list d
o
cumentation: do
c
ument all functions and
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-17
M
ikl
o
s
V
aj
n
a
r
un-command documentation: fix "memse
t
()
"
par
a
meter
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-09
Miklos Vajna
git-re
a
d-tree: document -v o
p
tion
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Miklos Vajna
A simple
s
cript to
p
arse the results
f
ro
m
t
he testcase
s
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
M
iklo
s
Va
j
na
git-rebase -i: men
t
ion the short command aliases in
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-08
Mik
l
os
Vajna
Remo
v
e unused code
i
n
parse_commit_buff
e
r
(
)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-06-04
Miklos Vajna
Strbu
f
doc
u
me
n
ta
t
ion:
d
ocument most functions
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-31
Mikl
o
s
V
ajna
Revision walkin
g
docu
m
entati
o
n: do
c
ument most impor
t
ant
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-25
Miklos
V
ajna
Co
d
ingGuid
e
lines: Add a note to avoid assi
g
nment
s
i
ns
i
de
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-21
Mik
l
os Vajna
g
i
t-merge: exclude
unnecessary options
f
r
o
m OPTIONS
_
SPEC
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-16
Mikl
o
s Vajna
git-f
a
st-
i
mport: re
n
a
me cmd_*() functions to
parse_*()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-05-05
Mik
l
os
Vaj
n
a
INS
T
ALL: ad
d
a note about GNU interactive tools
has
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos Vajna
Add tests for sen
d
email
.
cc c
o
n
f
iguration variabl
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklo
s
Va
j
na
git
-
s
e
nd-email: add a new sendemail
.
cc configur
a
tion
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-30
Miklos
Vajna
git-forma
t
-patch:
add a
n
ew
format
.
cc co
n
f
i
guratio
n
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-27
Miklos Vaj
n
a
gi
t
c
heckout: add -t alias for --track
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-23
M
i
k
l
o
s
V
a
j
na
d
iff o
p
tions
documentation: refer to --diff-fil
t
er
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklo
s
Vajna
contrib/hooks: ad
d
an examp
l
e
pre-auto-
g
c hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos
Vaj
n
a
Documen
t
ation/hooks
:
add pre-aut
o
-gc h
o
ok
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-04-09
Miklos Vajna
git-gc --auto: add pr
e
-au
t
o-gc hook
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-19
Miklos Vajn
a
Documen
t
ati
o
n/git-merg
e
: document subtree s
t
ra
t
egy
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-15
Mi
k
l
o
s Vajna
g
it-gui
:
U
p
da
t
ed
H
u
n
garian translat
i
on (e
5
fba18)
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-03-13
Mikl
o
s
Vajna
Update
Hungarian trans
l
a
tion
.
100% c
o
mp
l
eted
.
commit
|
commitdiff
|
tree
2008-02-29
Miklos Vajna
Im
p
ro
v
e t6029 to check
t
he real "subtree" case
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-27
Mi
k
los Va
j
na
Documen
t
ation
/
git svn lo
g
: add a note abo
u
t timez
o
nes
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-25
M
i
klos
V
ajna
Doc
u
me
n
t
a
t
ion/git-filte
r
-branch: add a new msg
-
filter
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-21
Miklos Vajna
git-clean: handle errors if
remov
i
n
g fi
l
es fails
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-20
M
ik
l
o
s
Vajna
Documen
t
a
t
ion/git
-
s
tash:
d
o
c
u
ment op
t
ions for git sta
s
h
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-13
M
ik
l
o
s
V
ajna
git clone
-s documen
t
ati
o
n: forc
e
a
new paragraph for
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-02-11
Mikl
o
s Vajna
builtin-gc
.
c: guard config parser from va
l
ue=NULL
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-31
Miklo
s
V
a
j
n
a
git r
e
v-pars
e
ma
n
pag
e
:
spelling
f
ix
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-26
Miklos Vaj
n
a
git p
u
l
l
manpage: d
o
n't include -n from
f
etch-opti
o
ns
.
txt
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-23
Miklos Vajna
git
-
clone -s: d
o
cument pro
b
le
m
s with git
g
c --prune
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-18
Miklos
Va
j
na
Include rev-lis
t
opt
i
ons i
n
git-log manpage
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-16
Miklos V
a
jna
ls-r
e
m
ote: add -t
and -h options
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-15
M
i
klos Vajna
Add using merge s
u
b
tree How-To
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2008-01-05
Miklos Vajna
t/t7001: avoi
d
unnecessary ERE when using grep
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-29
Miklo
s
Vaj
n
a
git-
s
h-
s
etup: docu
m
ent git_
e
ditor() and g
e
t_autho
r
_
ident_
f
r
o
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-21
Miklos Vajna
everyday: replac
e
'prune' an
d
'repack' wi
t
h 'gc'
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Miklos
V
a
j
na
Up
d
ate Hungar
i
an trans
l
ation
.
100
%
completed
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-12-05
Mikl
o
s Vajn
a
Inclu
d
e diff options in the git-
l
o
g manpage
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-25
Miklos Vaj
n
a
gi
t
-
s
end-email: a
d
d a new se
n
demail
.
to configurat
i
on
.
.
.
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-10-01
Miklos Vajna
gi
t
s
t
a
sh: docu
m
ent apply's --ind
e
x switch
commit
|
commitdiff
|
tree
2007-09-29
Miklos
Vajna
gi
t
-b
u
n
d
le:
f
ix commandline ex
a
mples in the ma
n
pa
g
e
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-23
Mikl
o
s Vajna
User
Ma
n
ua
l
: add a chapter for
s
ubmod
u
les
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-09-02
Miklos Vajna
Hungar
i
an tran
s
lation
o
f
g
it-
g
ui
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-12
M
i
klo
s
Vajna
gitweb: new cgi
p
a
ramete
r
: o
p
t
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-07
Mi
k
lo
s
Vajna
g
itweb: pre
f
er git_get_pr
o
ject_
o
wner() ov
e
r get_fi
l
e_owner()
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree
2007-07-04
Miklo
s
Vajna
Docum
e
nt -<n> for git-format-patch
Signed-off-by: Miklos Vajna <
vmiklos@frugalware.org
>
commit
|
commitdiff
|
tree