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 --renormalize
2010-08-06
Jonathan N
i
e
d
er
merg
e
-recur
s
ive --renormali
z
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nie
d
er
rerere:
ne
v
e
r
re
n
orm
a
lize
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
athan
Nieder
rerere: mig
r
a
t
e to
pa
r
se-op
t
ions API
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jon
a
than Nieder
t4200 (re
r
ere
)
:
modernize style
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
ll-merge: let caller decide whether to re
n
ormalize
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
o
n
athan Nieder
ll-merge:
make flag eas
i
er to
populate
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
Doc
u
mentation/techn
i
cal: docu
m
e
n
t ll_me
r
ge
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
merge-trees: let caller decide whether t
o
r
enormalize
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
me
r
ge
-
tree
s
: pus
h
ch
o
ice to
r
enormalize
a
way from low
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
t
6
038 (merge
.
r
e
n
o
rmalize): check that it can be turned
off
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
N
ied
e
r
t6038 (merge
.
renormaliz
e
): try checkout
-
m and cherr
y
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Niede
r
t6038 (merge
.
renormalize): styl
e
n
itp
i
cks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-14
Jonathan
N
ieder
g
it-svn
:
strip
off leading
slashes on -
-
trunk ar
g
u
m
e
nt
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-13
J
onathan
Nieder
add
-
i
nterac
t
ive: Clarify “remaining hunks in the file”
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
J
onathan Nied
e
r
Document
a
tion/chec
k
o
u
t: clari
f
y
de
s
cription
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-11
J
o
nathan Ni
e
der
r
ebase -
i
-p: document
shortcomings
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-02
Jonat
h
an Nieder
D
W
IM
'
git show -5' to
'git show
--do-walk -
5
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
g
i
tigno
r
e
.
5: C
l
a
r
ify mat
c
hing rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nie
d
er
rebase: improve error message whe
n
upst
r
ea
m
argu
m
ent
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
Documentat
i
o
n
/checkout: clarify de
s
cription
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-28
Jonathan N
i
eder
fsck:
f
ix
bogus commit header check
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
Jonathan
Nie
d
er
Add git remot
e
set-bran
c
he
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-20
Jon
a
than Nieder
p
os
t
-receive-email: document command-li
n
e
mode
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
git svn: avoi
d
uninitialized var in 'reset'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
Nieder
Mak
e
file:
let header depe
n
d
e
ncy checker o
v
e
rri
d
e COMP
U
TE_H
E
A
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Ma
k
efi
l
e:
fi
x
h
e
ader dependency checker to
allow NO_CU
R
L
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Do
c
umentation
/
notes: nitp
i
c
ks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan Nieder
D
o
cumentatio
n
/notes: c
l
ean
up descrip
t
ion of
rewritin
g
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
o
n
at
h
a
n
Nieder
Documentation/no
t
es: simpli
f
y
treatme
n
t
of def
a
ult
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan Nieder
Document
a
tion/log:
add
a
C
ONFIG
U
RATION se
c
tion
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Ni
e
der
Documentation/notes: simplify treatment of d
e
fault
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nath
a
n N
i
eder
Document
a
tion/notes: add conf
i
gu
r
ation section
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Documentation/not
e
s: describe content of
not
e
s blo
b
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nied
e
r
Docum
e
ntation/note
s
: document format of notes
tr
e
es
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jon
a
than Nieder
cherry-
p
i
c
k: d
o
not dump core
w
hen iconv fails
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jonat
h
an Ni
e
der
pretty: ini
t
ialize
n
e
w cm
t
_fmt_map
to 0
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Nie
d
er
adapt r
e
quest-
p
ull tests
f
o
r
ne
w
p
u
ll req
u
est format
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-06
Jonath
a
n Nieder
test-lib: some shells do not l
e
t $? propagate in
t
o
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonat
h
an Nie
d
er
shortlog: Document and test --f
o
rm
a
t op
t
ion
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonat
h
an Nieder
t4201 (shortlog): Test output forma
t
with multip
l
e
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonatha
n
Niede
r
t4201
(
sh
o
rtlog):
guard setup with test_expect_success
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
Documentation/shortlog: scripted users should n
o
t
rel
y
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
J
o
nathan Nied
e
r
commit --amend: cope
wi
t
h missing
d
isplay n
a
me
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-04
Jo
n
athan
N
ieder
test-li
b
: L
e
t
tests
s
pecify commands t
o
b
e
r
un at end
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonat
h
an Nieder
f
s
ck:
c
heck i
d
ent
l
ines in
c
ommit o
b
jects
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jonathan Nieder
request-pull: pr
o
tect
against OPT
I
ONS_KEEPDASHDASH
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-05-01
Jon
a
than
N
i
e
der
te
s
ts for request-pul
l
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-22
J
onathan Nieder
Documentati
o
n
/Makefil
e
:
fix interrupted builds of user
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Niede
r
fix
"
bundle --
s
tdin" segfault
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nieder
t57
0
4 (bundle):
a
dd te
s
ts for b
u
ndle -
-
s
tdin
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-17
Jonatha
n
Nied
e
r
tag
-
v: use RUN_GIT_CMD
t
o run verify
-
tag
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonatha
n
N
i
eder
D
ocum
e
nt new "alrea
d
y-
m
e
r
g
e
d
"
rule f
o
r branch
-
d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan
Nieder
Add
.
dep
e
nd dir
e
c
t
ories
t
o
.
gitig
n
ore
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Nieder
t7006: guard
c
leanup with test_expect_suc
c
ess
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-13
J
onathan Niede
r
t58
0
0:
t
e
s
t
g
it
h
e
l
per requires Python support
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jona
t
han Nieder
t740
0
: clarify submod
u
le upda
t
e tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Ni
e
d
er
t
7400: clarify 'su
b
module add' te
s
ts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nie
d
er
t74
0
0:
split setup into
multiple tests
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-04
Jonathan Nieder
Teac
h
mailinfo %
<
as
a
n alternativ
e
scisso
r
s
mark
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-03
Jo
n
atha
n
Nieder
Makefile: future-pr
o
of Cygwin
version chec
k
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Niede
r
me
r
ge-recursive: a
d
d a lab
e
l for ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
cherry
-
pi
c
k, r
e
vert
:
add a label
for ancesto
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nied
e
r
revert: clarify label
on conflict hun
k
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
compat: add mempcpy()
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onath
a
n
N
ieder
checkout -m --conflict
=
diff3: add a
l
abel fo
r
ances
t
or
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan
Nieder
mer
g
e_t
r
ees()
:
add ances
t
or label paramet
e
r f
o
r dif
f
3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nied
e
r
merge_file(): add comment expl
a
ining behavior
w
r
t
c
onflict
.
.
.
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Niede
r
c
heck
o
u
t
--conflict=diff3: add a lab
e
l for a
n
cestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han
N
ieder
ll_
m
erg
e
(): add
a
nce
s
tor l
a
bel parameter for diff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
merg
e
-
f
il
e
--diff3: add a label for an
c
e
s
t
o
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Niede
r
x
d
l_merg
e
(): move file1
a
n
d file2 labels to xmparam
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n N
i
eder
xdl_
m
er
g
e(): add op
t
ion
a
l ancest
o
r
label to di
f
f3-style
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
tests:
docu
m
e
nt cherry-pick behav
i
o
r in face of conflicts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
eder
t
e
s
t
s
: document format
of
c
onflicts from
check
o
ut -m
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nied
e
r
revert: fix tiny memory leak
i
n
cherry-pick --ff
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jo
n
a
t
han Nieder
Makef
i
le: Fix oc
c
asional G
I
T-CFLAGS break
a
g
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan
N
ied
e
r
Make
f
ile: Fix CDPATH problem
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jo
n
atha
n
N
i
ed
e
r
g
i
t
k: Don'
t
clobber "Remember this view" setting
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
g
it
k
: Add c
o
m
m
ents to expla
i
n encode_view_opt
s
and
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-28
J
onath
a
n
N
ie
d
er
Makefile: clarify def
i
ni
t
ion
of TEST_OBJS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-23
Jonathan Nieder
am:
remove rebase
-
apply directory be
f
ore g
c
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-22
Jonathan Nieder
test
s
: Fix
race con
d
i
tion in t7
0
06-pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-21
Jonathan Ni
e
der
t7006
-
pager
:
if
s
tdout is not a term
i
nal, make a n
e
w
o
n
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-20
Jonathan Nieder
tes
t
s:
A
dd tes
t
s for
a
utomatic use of pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonatha
n
Nieder
am: Fix launching of pa
g
er
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonatha
n
Nieder
git s
v
n: Fi
x
laun
c
hing of p
a
ger
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nieder
git
.
1
:
Clari
f
y the behavior
o
f the -
-
p
ag
i
nate
option
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jo
n
atha
n
Nied
e
r
M
a
ke 'git var G
I
T_PAGER' always pri
n
t the
c
onfig
u
red
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nie
d
er
F
ix
'
g
i
t var
'
u
s
age synopsis
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan Nieder
Makefile:
a
lways rem
o
ve
.
depend dir
e
c
to
r
ies o
n
'
make
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jonath
a
n Nied
e
r
Makefile: tuck away generat
e
d
makefile fragmen
t
s in
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan
N
iede
r
Do not install shell
libraries executable
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-27
Jonathan Nie
d
er
T
e
a
c
h Ma
k
efile to check header dep
e
ndencies
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-27
Jonathan Nied
e
r
Makefile: list standalone progra
m
object files
i
n PROGRAM_OBJS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Makefile: lazi
l
y comput
e
head
e
r
d
ependencies
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Niede
r
Makefile: list generated
o
bject files in OBJECTS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan N
i
eder
Makefile: disabl
e
defau
l
t implicit rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan
N
ieder
Ma
k
efile: rearrang
e
d
ependency rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonatha
n
N
i
eder
Ma
k
efile:
transport
.
o depends
on branch
.
h now
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan
Nieder
Merge bra
n
ch
'
maste
r
' of git://re
p
o
.
or
.
cz/alt-git
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
next