repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: introduce merge_options
2008-08-31
Mikl
o
s
V
ajna
merge-recursive: introduce merge_options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Stephan Beyer
merge-
r
ecursi
v
e
.
c:
Add more generi
c
merge_recu
r
sive_gen
e
r
ic()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Mik
l
o
s
V
ajn
a
Split out merge_re
c
ursi
v
e() to merge
-
rec
u
rsive
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-31
Ju
n
io C
Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2008-08-31
Junio C
H
a
m
ano
gitat
t
rib
u
tes: -crlf
is not binar
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Hamano
git-apply
:
Loosen "match_beg
i
n
n
in
g
"
logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o C Hamano
Fix
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 Ha
m
ano
Me
r
ge branch 'sp/
m
issing-t
h
in-base
'
in
t
o m
a
int
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o C
Hamano
Me
r
ge branch 'sb/da
e
mon'
commit
|
commitdiff
|
tree
2008-08-30
J
u
nio C Ha
m
ano
Merge bran
c
h 'af/
m
a
i
nt-install-no-han
d
l
i
nk'
into main
t
commit
|
commitdiff
|
tree
2008-08-30
Jun
i
o C Ha
m
ano
sh
e
ll:
do not play duplicated definition
g
ames to sh
r
ink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Alex Riese
n
Fix
use
o
f
har
d
links in "mak
e
install"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-30
Junio C Ha
m
ano
M
erge branch 'np/verify-pack' into maint
commit
|
commitdiff
|
tree
2008-08-29
Juni
o
C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-08-29
Tor Arv
i
d Lun
d
git-p4: Fix checkout bug
w
h
en usin
g
--import
-
loc
a
l
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Paolo Ciarrocchi
t
utori
a
l:
gentler illustration of
Alic
e
/B
o
b w
o
rkflow
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Jeff
Kin
g
pretty=format:
respect dat
e
f
o
r
m
at o
p
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Paolo Bon
z
ini
make git-shell paran
o
id about clo
s
ed stdin/s
t
dout/stde
r
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Yann
D
i
rs
o
n
Document gitk --argscm
d
flag
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Li
n
us Torv
a
l
d
s
Fix '--dirstat' with
cross-directory
renaming
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Björn Steinbri
n
k
for-each
-
ref: Allow a traili
n
g sl
a
sh in the patter
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex
R
iesen
li
s
t_commands: o
n
ly call git_exec_pa
t
h
i
f it is needed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex R
i
es
e
n
A
llow git help wor
k
w
ithout P
A
TH set
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
Make main_cmds and other_cmds local to buil
t
in-help
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Riesen
R
e
mo
v
e useless memset
o
f s
t
atic
com
m
and name lis
t
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Ri
e
s
en
Remove calculation o
f
the lo
n
ge
s
t command
name from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
Br
a
ndon Casey
d
ir
.
c: Avoid c99
arr
a
y initialization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-29
M
a
tthias Kes
t
enholz
b
ash-completion:
Add all submodule subcommands to the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-28
Junio
C
H
a
mano
Merge
branch 'mv/merge-custom'
commit
|
commitdiff
|
tree
2008-08-28
J
u
nio C Hamano
M
e
rg
e
branch 'ml/sub
m
odule'
commit
|
commitdiff
|
tree
2008-08-27
Ju
n
io C Hamano
Merge
branch 'am
/
cherry-pic
k
-rerere'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Hama
n
o
Merge b
r
a
nch '
j
c/
a
dd-addremove
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Ha
m
an
o
Mer
g
e branch 'np/ve
r
ify-pa
c
k'
commit
|
commitdiff
|
tree
2008-08-27
Juni
o
C Hamano
Merge br
a
nch 'da/
s
u
b
m
o
dule-sync'
commit
|
commitdiff
|
tree
2008-08-27
Junio
C
Hamano
Merge b
r
anch
'
maint'
commit
|
commitdiff
|
tree
2008-08-27
Junio C H
a
man
o
ctype
.
c: pro
t
ect
tiny C preprocessor constant
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Linus
Torv
a
lds
index-
p
ack: b
e
c
are
f
ul after fixing up the heade
r
/footer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Si
m
on
H
ausm
a
nn
Make it p
o
ssible to
abor
t
the submission of
a
change
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-27
Juni
o
C
Hamano
Merge
bran
c
h
'af/maint-install-no-handlink
'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hamano
Merge branch 'jc
/
no-sli
m
-shell'
commit
|
commitdiff
|
tree
2008-08-27
Junio C Hama
n
o
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-08-27
Jeff
K
i
n
g
f
o
rmat-patch
:
use defau
l
t
d
i
ff format even with p
a
tch
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
N
g
uyễn Thái Ngọ
c
D
u
y
index-pack: setup
gi
t
repo
s
itory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
R
am
s
ay Jones
S
u
ppre
s
s
some bash redi
r
ection
e
rror messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Ramsay Jon
e
s
F
i
x a w
a
rning (
o
n cygwin) to allow -Werr
o
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Andreas Färber
Mak
e
file: alwa
y
s provide a fallback
when h
a
rdlinks
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio C Ha
m
ano
daemon
.
c: minor st
y
le fixu
p
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 Agui
l
ar
gi
t
-s
u
bmodul
e
:
add "sync" command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-26
Junio C Hamano
Revert "Build
-
in "git-shell""
commit
|
commitdiff
|
tree
2008-08-25
Jeff King
Fix "git log
-i -
-
grep"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Tomm
i
Virt
a
nen
In
s
tall git-she
l
l
in bi
n
d
ir, too
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C H
a
m
ano
M
e
rge branch 'j
c
/no-slim-s
h
ell'
commit
|
commitdiff
|
tree
2008-08-24
Junio
C
Hamano
Merge branch '
m
a
int' to sync with 1
.
6
.
0
.
1
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
GIT 1
.
6
.
0
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Ju
n
io
C
Haman
o
Merge
b
ranch 'ag/maint-combine-diff
-
fi
x
'
into maint
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hamano
Merge br
a
n
ch 'mv/maint-merge-fix'
i
n
to
m
a
int
commit
|
commitdiff
|
tree
2008-08-24
Mark Levedahl
git-submodule
-
Use "ge
t
_default
_
remo
t
e" from git-
p
arse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jonathan Ni
e
der
Documentation:
clarify pager configura
t
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Jonathan Ni
e
der
Documentation:
c
l
arify
pager
.
<c
m
d> configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Simon Hausmann
C
lean up the git-p
4
documentati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Alexand
e
r Gavrilov
Re
s
p
ect core
.
a
u
t
ocrlf in combined di
f
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Miklos Va
j
na
Makefile:
enable SNPRINTF
_
RETURNS_BOGUS for H
P
-
U
X
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C Haman
o
t7606:
fix cust
o
m merge te
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Ha
m
ano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2008-08-24
Juni
o
C Hama
n
o
merge: fix numer
u
s bugs
around "trivial mer
g
e
"
area
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-24
Junio C Hama
n
o
unpack_
t
rees():
pr
o
tect the handcrafted
in
-
c
ore index
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
T
or Ar
v
id Lund
git-p4: Fix
one-liner in p4_write_pipe
f
unctio
n
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
David A
g
uilar
git-
s
u
b
module: replac
e
duplicate
d
code w
i
th a
module_list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Nicolas Pitre
di
s
card revindex data when pack list
changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Dan Hensgen
git-merge do
c
umentatio
n
: more details about res
o
lving
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-23
Alex Riesen
Extend "chec
k
out --track" DWIM
t
o supp
o
rt m
o
re c
a
ses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Jonathan del Strother
Reve
r
t "Convert output m
e
ssages
i
n merge-recurs
i
ve
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Eric
R
ai
b
le
Compl
e
tion:
add missing '=' f
o
r 'diff --diff-filter'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Junio C Hamano
t
e
mplat
e
s/
M
akefile
:
install is u
n
necessary, just use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Br
a
ndon Casey
re
m
ote
.
c: add a f
u
nction for
d
e
l
eting
a refspec a
r
ray
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Johann
e
s
Sixt
fi
l
ter
-
branch: Grok special character
s
in tag names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
J
ohannes Schindelin
test-lib: do not remove
t
r
ash_
d
irectory if
called
with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Pa
o
lo
B
onzini
provi
d
e more er
r
ors for the "merge into empty h
e
ad
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Sh
a
wn
O
.
Pearce
M
a
k
e ref
l
og quer
y
'@{1219188291}' act as
'@{2008
.
8
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Neil Robe
r
ts
con
f
ig
.
mak
.
in
:
Pass on LDFLAGS from configure
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Mark Levedahl
git-
s
u
b
m
odule
.
sh -
Rem
o
ve trailing / fro
m
URL
i
f found
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-22
Miklos Vajna
Fix
'
g
it
he
l
p hel
p
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-08-21
Brandon Case
y
c
ompat/snprint
f
.
c
:
ha
n
dle snpr
i
nt
f
's
that always return
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Joha
n
Herland
Teach "gi
t
diff -p
"
HTML f
u
ncname p
a
tterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
Kirill S
m
elkov
Teach "git diff -
p
" Python fu
n
c
n
ame pa
t
t
e
rns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
E
r
ic
Wong
g
i
t-svn
:
fix dcommit
to urls wi
t
h
em
b
edd
e
d
userna
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-08-21
J
u
nio C
Hamano
Merg
e
branch 'ml/su
b
module-foreach'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge bran
c
h
'pm/log-exit-
c
ode'
commit
|
commitdiff
|
tree
2008-08-21
Junio C H
a
mano
Mer
g
e branch 'sb/commit-tree-mi
n
ileak'
commit
|
commitdiff
|
tree
2008-08-21
Junio C H
a
mano
Merge branch 'p
b
/reflog-dwim'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Haman
o
Merge
b
ra
n
ch 'jc/add-stop-at-symli
n
k'
commit
|
commitdiff
|
tree
2008-08-21
Junio
C
Hamano
M
e
rge b
r
anch
'
kh/diff-
t
ree'
commit
|
commitdiff
|
tree
2008-08-21
Junio C
Hamano
Merge branch '
m
g/count-objects'
commit
|
commitdiff
|
tree
2008-08-21
Juni
o
C Ha
m
ano
M
e
rge b
r
anch
'
mz/pu
s
h-verbose'
commit
|
commitdiff
|
tree
2008-08-21
J
unio C
Ha
m
ano
Merge branch
'
j
c
/index
-
exte
n
ded-fla
g
s'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Hamano
Merge bra
n
ch 'cc/merge-base-many'
commit
|
commitdiff
|
tree
2008-08-21
Jun
i
o
C H
a
man
o
Merge branch 'jc/test-deeper'
commit
|
commitdiff
|
tree
2008-08-21
Junio C Ha
m
ano
M
e
rge branch 'js/parallel
-
te
s
t'
commit
|
commitdiff
|
tree
2008-08-21
Ma
r
k
L
evedahl
gi
t
-submodule
.
sh - Remove trailing / from URL if fo
u
nd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next