repo.or.cz
/
git
/
mingw
/
4msysgit
/
wingit-dll.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
cherry-pick/revert: make direct internal call to merge_tree()
2008-09-03
Miklos Vaj
n
a
cherry-pi
c
k
/rever
t
: make direct i
n
ternal call
t
o m
e
rge_tree()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
M
i
k
l
o
s Va
j
na
bu
i
ltin-merge: avoid run_command_v_opt()
f
or recursive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
M
iklos Vajna
merge-re
c
ursive: introd
u
ce
merge_op
t
ion
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Stephan Beyer
merge-r
e
cursive
.
c: Add more gen
e
ric merge_
r
ecursi
v
e_generic()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Miklos Vajna
Split ou
t
merge_rec
u
r
si
v
e(
)
to merg
e
-recursive
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Junio C
Ham
a
no
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-08-31
J
unio C
Hamano
gitattributes:
-
crlf is not bi
n
ar
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio
C
Hama
n
o
git-apply: Loos
e
n "match_beginning" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o C Ham
a
no
F
ix example
in git-name-rev documenta
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C
Haman
o
Merge
branch 'sp/
m
issing-thin-base' into
m
aint
commit
|
commitdiff
|
tree
2008-08-30
J
u
nio C Ham
a
no
Merge branch 's
b
/daemon
'
commit
|
commitdiff
|
tree
2008-08-30
Junio
C Hamano
Merge branch 'af
/
main
t
-install-no-han
d
l
i
n
k'
i
n
to maint
commit
|
commitdiff
|
tree
2008-08-30
Junio
C Ham
a
no
s
h
ell: do
n
ot p
l
ay
d
uplicate
d
def
i
nition
games to s
h
rink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Al
e
x Riesen
Fix use of hardlinks
i
n
"make install"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C
Hamano
Merge branch 'np/verify-pack'
into maint
commit
|
commitdiff
|
tree
2008-08-29
Junio C Ha
m
ano
Merge
branc
h
'maint'
commit
|
commitdiff
|
tree
2008-08-29
Tor Arvid Lund
git-p4: Fix c
h
e
c
kout
bu
g
when using --import-l
o
c
a
l
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Pa
o
lo Ciar
r
o
cchi
tu
t
o
rial:
gentler ill
u
stration of Alice/Bob w
o
rkflow
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Jeff Kin
g
pret
t
y=for
m
a
t: respect date format options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Paolo Bo
n
zini
make gi
t
-shell parano
i
d about closed stdin/stdout/stderr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Yann
D
irson
Docume
n
t
gitk --argscm
d
flag
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Linus Torvalds
Fix
'
--dirstat
'
w
i
th cross-directory renaming
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Björn Steinbri
n
k
f
o
r-each-ref:
Allow
a
trailing slash in
t
h
e patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex
R
ies
e
n
list_commands:
o
n
ly
c
all git_exec
_
pat
h
if it is neede
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Allow git help work wi
t
hou
t
PATH set
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Ale
x
Riesen
Ma
k
e
main_cmds and other_cmds
local to builtin
-
help
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Ries
e
n
Re
m
ov
e
useless m
e
mset of static com
m
a
n
d n
a
me
l
ists
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Remove
calcu
l
a
t
ion o
f
t
he longest com
m
a
n
d
name from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Brandon Casey
d
i
r
.
c:
A
v
oid c99 a
r
r
ay init
i
alization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Matthias Kes
t
enholz
bash-completion:
Add
a
ll sub
m
odule subcommands to the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-28
Junio C Hamano
Merge branch 'mv
/
merge-custom'
commit
|
commitdiff
|
tree
2008-08-28
Junio C Hamano
Me
r
ge branch 'ml/
s
ubm
o
dule'
commit
|
commitdiff
|
tree
2008-08-27
Jun
i
o C H
a
m
a
n
o
Merge branch 'am/cherry-
p
ick-re
r
ere'
commit
|
commitdiff
|
tree
2008-08-27
J
u
nio
C
Ha
m
ano
Mer
g
e bran
c
h 'jc/add-addremove'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
io
C
H
a
mano
Merge branch
'
np/verify-pack'
commit
|
commitdiff
|
tree
2008-08-27
J
unio C H
a
mano
Merge branch 'da/submodule-syn
c
'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
io C Hamano
Merge branch
'm
a
int'
commit
|
commitdiff
|
tree
2008-08-27
Junio C
H
am
a
n
o
ctype
.
c
: prote
c
t tiny C preproce
s
sor c
o
nstants
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Linus Tor
v
al
d
s
index
-
p
a
ck: be careful a
f
ter fixing
u
p the
header/footer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Simon Hausmann
M
a
k
e it
p
ossib
l
e to a
b
o
rt t
h
e submission of a ch
a
nge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Juni
o
C
Haman
o
Me
r
ge branch 'af/maint-in
s
ta
l
l-no-handlink'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C Haman
o
Me
r
ge branch 'jc
/
no
-
slim-shell'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge br
a
nch
'maint'
commit
|
commitdiff
|
tree
2008-08-27
Jeff King
format-patch: use de
f
ault diff
for
m
at e
v
e
n
wit
h
patch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ng
u
yễn T
h
á
i Ngọc Du
y
in
d
ex-pack: setup git
reposito
r
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay
J
ones
Suppress some bash r
e
directio
n
e
r
ror messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
R
amsay
Jo
n
e
s
Fix a war
n
ing (on cygwi
n
) t
o
allow -W
e
rror
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Andreas
Färber
Makefile: always provide a fallback when h
a
rdli
n
k
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio
C
Hamano
daemon
.
c
:
m
i
nor
style
fixup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>:
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
David Aguil
a
r
git-submodule: a
d
d "sync" com
m
and
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio C Hamano
R
e
ve
r
t "B
u
ild-
i
n "g
i
t-shell""
commit
|
commitdiff
|
tree
2008-08-25
Jeff King
F
ix "git log
-i --grep"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Tommi
Virtanen
Install
g
it-shell in
b
indir, t
o
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o C Hamano
Merge branch '
j
c
/no
-
slim-shell'
commit
|
commitdiff
|
tree
2008-08-24
Junio C Haman
o
M
e
rge branch '
m
aint' t
o
sync with 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Jun
i
o C Hamano
GIT 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
M
e
rge
b
ra
n
ch 'ag/maint-com
b
ine-diff-
f
ix' into maint
commit
|
commitdiff
|
tree
2008-08-24
J
u
ni
o
C
Hamano
Me
r
ge b
r
anch 'mv/
m
aint-
m
erge-fix' into main
t
commit
|
commitdiff
|
tree
2008-08-24
Mark
Lev
e
da
h
l
git-s
u
bmodule - Use "get_def
a
ult_remote" fr
o
m git-
p
ar
s
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
J
o
n
athan Nieder
D
oc
u
men
t
a
t
ion: cla
r
i
fy pager co
n
figurat
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jonat
h
an Nieder
Documentation: clarify
pager
.
<cmd
>
configuratio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Simon Hausmann
Cl
e
an up the git-p4 doc
u
mentation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Alexander Gavrilov
Respect core
.
autocrlf
i
n combined
d
i
f
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Mik
l
os Vajna
Makefile: enabl
e
S
N
PRINTF_RE
T
URNS
_
BO
G
US for HP-UX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C Ha
m
ano
t
7
6
06: fix custom merge test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Ham
a
no
Merge
b
r
anch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-08-24
J
unio C Hamano
m
e
rge
:
fix
nu
m
er
u
s
bugs around "trivial merge" a
r
ea
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
unpack_trees(): protect the handcrafte
d
in-core inde
x
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Tor A
r
v
i
d Lund
git-p4
:
Fix one-li
n
er in p4_write_pi
p
e
f
u
nction
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Da
v
id Aguil
a
r
git-s
u
bmodule: replace duplicat
e
d code w
i
t
h
a modu
l
e_
l
ist
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
N
i
c
olas
P
itre
dis
c
a
r
d revin
d
ex data
w
hen
pack list changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Dan Hensgen
git
-
merge
documentation: more
d
etails about
r
e
s
ol
v
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Al
e
x Ries
e
n
Extend "che
c
kout --tra
c
k
" DWIM
t
o supp
o
r
t mor
e
cases
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Jonathan
de
l
Str
o
ther
R
e
vert "Conve
r
t output messages
in merge-
r
ecursive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Eric Raible
Completi
o
n
: add missin
g
'=' for
'diff -
-
diff-filt
e
r'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
J
un
i
o
C Hamano
t
e
mplates/Makefile: install is unnecessary
,
just use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Brand
o
n
Ca
s
ey
remote
.
c: add a function for
d
el
e
ting a refspec arr
a
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johannes Sixt
filter-branch: G
r
ok special characters in tag names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Joha
n
nes Schindelin
t
est-l
i
b:
d
o
n
o
t remo
v
e
trash_dir
e
ctory if c
a
lle
d
with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Paolo Bo
n
z
i
ni
prov
i
de more errors for the "merge into empty head
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Shawn O
.
P
earce
M
a
ke r
e
flog q
u
ery '@{12191
8
8
2
91}' act as '@{2008
.
8
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Neil Rob
e
r
t
s
config
.
mak
.
i
n
: Pass on LDFLAGS from co
n
figure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Mark Leve
d
ah
l
git-
s
u
bmodu
l
e
.
s
h
- Remove t
r
ailing / from U
R
L if fou
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Miklos V
a
jna
Fix 'git help help'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
M
e
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-21
Brandon C
a
s
ey
compat/snprint
f
.
c: hand
l
e snprintf's that
always
r
e
turn
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Johan
H
e
rland
Tea
c
h "git diff -p" HTML
f
uncnam
e
patte
r
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Ki
r
ill Smelk
o
v
Teac
h
"git di
f
f -p" Python funcname
pa
t
terns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Eri
c
Wong
git-svn: f
i
x dcom
m
it to urls
w
ith e
m
b
e
dded user
n
ames
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merg
e
branch 'ml/s
u
bmodule-foreach'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
Hamano
Merge branch
'
pm/l
o
g-exi
t
-co
d
e'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o C Hamano
Merge br
a
nch 'sb/commit-tr
e
e-minileak'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
H
a
mano
Me
r
ge bra
n
ch
'
p
b
/reflog-dwim'
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C Ha
m
ano
M
e
r
ge
b
r
a
nch 'jc/add-stop-a
t
-syml
i
nk'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o
C
Hamano
Merge branch
'kh/diff-t
r
ee'
commit
|
commitdiff
|
tree
2008-08-21
Ju
n
io
C
Hamano
Merge br
a
nch 'm
g
/cou
n
t-obj
e
cts'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
H
ama
n
o
Merge branch 'mz
/
push-v
e
rbose'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
Hamano
Merge branch 'jc/index-exte
n
ded-flags'
commit
|
commitdiff
|
tree
2008-08-21
J
u
ni
o
C Hamano
M
e
r
ge branch 'cc/
m
erge
-
base-many'
commit
|
commitdiff
|
tree
2008-08-21
Junio C H
a
mano
M
e
rge
branch 'jc/test-deeper'
commit
|
commitdiff
|
tree
next