| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'jc/maint-branch-mergeoptions' into maint | Junio C Hamano | 2011-05-16 | 2 | -15/+58 |
| |\ | |||||
| | * | merge: make branch.<name>.mergeoptions correctly override merge.<option> | Junio C Hamano | 2011-05-06 | 2 | -14/+57 |
| * | | Merge branch 'jc/maint-add-p-overlapping-hunks' into maint | Junio C Hamano | 2011-05-16 | 3 | -16/+54 |
| |\ \ | |||||
| | * | | t3701: add-p-fix makes the last test to pass | Junio C Hamano | 2011-05-08 | 1 | -1/+1 |
| | * | | "add -p": work-around an old laziness that does not coalesce hunks | Junio C Hamano | 2011-04-29 | 2 | -4/+7 |
| | * | | add--interactive.perl: factor out repeated --recount option | Junio C Hamano | 2011-04-29 | 1 | -8/+8 |
| | * | | t3701: Editing a split hunk in an "add -p" session | Junio C Hamano | 2011-04-29 | 1 | -0/+36 |
| | * | | add -p: 'q' should really quit | Junio C Hamano | 2011-04-29 | 1 | -5/+4 |
| * | | | Documentation/git-fsck.txt: fix typo: unreadable -> unreachable | Jim Meyering | 2011-05-16 | 1 | -2/+2 |
| * | | | Update draft release notes to 1.7.5.2 | Junio C Hamano | 2011-05-15 | 1 | -0/+9 |
| * | | | Merge branch 'cn/format-patch-quiet' into maint | Junio C Hamano | 2011-05-15 | 2 | -7/+14 |
| |\ \ \ | |||||
| | * | | | format-patch: document --quiet option | Carlos Martín Nieto | 2011-04-12 | 1 | -1/+4 |
| | * | | | format-patch: don't pass on the --quiet flag | Carlos Martín Nieto | 2011-04-12 | 1 | -6/+10 |
| * | | | | Merge branch 'jm/mergetool-submodules' into maint | Junio C Hamano | 2011-05-15 | 2 | -9/+371 |
| |\ \ \ \ | |||||
| | * | | | | mergetool: Teach about submodules | Jonathon Mah | 2011-04-13 | 2 | -9/+371 |
| * | | | | | Merge branch 'jk/format-patch-quote-special-in-from' into maint | Junio C Hamano | 2011-05-15 | 2 | -1/+102 |
| |\ \ \ \ \ | |||||
| | * | | | | | pretty: quote rfc822 specials in email addresses | Jeff King | 2011-04-26 | 2 | -1/+102 |
| * | | | | | | Merge branch 'vh/git-svn-doc' into maint | Junio C Hamano | 2011-05-15 | 1 | -11/+11 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | git-svn.txt: small typeface improvements | Valentin Haenel | 2011-04-26 | 1 | -4/+4 |
| | * | | | | | | git-svn.txt: move option descriptions | Valentin Haenel | 2011-04-26 | 1 | -11/+11 |
| | * | | | | | | git-svn.txt: fix usage of --add-author-from | Valentin Haenel | 2011-04-26 | 1 | -1/+1 |
| * | | | | | | | git_open_noatime(): drop unused parameter | Junio C Hamano | 2011-05-15 | 1 | -8/+7 |
| * | | | | | | | sha1_file: typofix | Junio C Hamano | 2011-05-15 | 1 | -1/+1 |
| * | | | | | | | add, merge, diff: do not use strcasecmp to compare config variable names | Jonathan Nieder | 2011-05-14 | 3 | -6/+6 |
| * | | | | | | | Prepare for 1.7.5.2 | Junio C Hamano | 2011-05-13 | 2 | -1/+34 |
| * | | | | | | | Merge branch 'aw/maint-rebase-i-p-no-ff' into maint | Junio C Hamano | 2011-05-13 | 2 | -2/+32 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff | Andrew Wong | 2011-04-28 | 2 | -2/+32 |
| | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | | Merge branch 'js/blame-parsename' into maint | Junio C Hamano | 2011-05-13 | 3 | -3/+14 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | t/annotate-tests: Use echo & cat instead of sed | Brian Gernhardt | 2011-05-05 | 1 | -1/+2 |
| | * | | | | | | | blame: tolerate bogus e-mail addresses a bit better | Josh Stone | 2011-04-29 | 3 | -3/+13 |
| | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | | Merge branch 'gr/cvsimport-alternative-cvspass-location' into maint | Junio C Hamano | 2011-05-13 | 1 | -12/+41 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Look for password in both CVS and CVSNT password files. | Guy Rouillier | 2011-05-01 | 1 | -12/+41 |
| * | | | | | | | | Merge branch 'cj/p4merge' into maint | Junio C Hamano | 2011-05-13 | 1 | -6/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Pass empty file to p4merge where no base is suitable. | Ciaran Jessup | 2011-05-01 | 1 | -6/+3 |
| | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'jk/merge-one-file-working-tree' into maint | Junio C Hamano | 2011-05-13 | 2 | -1/+106 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | merge-one-file: fix broken merges with alternate work trees | Jeff King | 2011-04-29 | 2 | -3/+8 |
| | * | | | | | | | | add tests for merge-index / merge-one-file | Jeff King | 2011-04-29 | 1 | -0/+100 |
| * | | | | | | | | | Merge branch 'jc/fix-diff-files-unmerged' into maint | Junio C Hamano | 2011-05-13 | 16 | -36/+120 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | diff-files: show unmerged entries correctly | Junio C Hamano | 2011-04-23 | 2 | -2/+95 |
| | * | | | | | | | | | diff: remove often unused parameters from diff_unmerge() | Junio C Hamano | 2011-04-23 | 3 | -11/+6 |
| | * | | | | | | | | | diff.c: return filepair from diff_unmerge() | Junio C Hamano | 2011-04-23 | 2 | -6/+9 |
| | * | | | | | | | | | test: use $_z40 from test-lib | Junio C Hamano | 2011-04-23 | 12 | -22/+15 |
| * | | | | | | | | | | Merge branch 'mz/maint-rename-unmerged' into maint | Junio C Hamano | 2011-05-13 | 2 | -2/+67 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | diffcore-rename: don't consider unmerged path as source | Martin von Zweigbergk | 2011-03-23 | 2 | -2/+67 |
| * | | | | | | | | | | | t5400: Fix a couple of typos | Johan Herland | 2011-05-13 | 1 | -2/+2 |
| * | | | | | | | | | | | Remove duplicated "is a" | João Britto | 2011-05-05 | 1 | -1/+1 |
| * | | | | | | | | | | | t3701: fix here document | Junio C Hamano | 2011-05-05 | 1 | -3/+2 |
| * | | | | | | | | | | | git-fast-import.txt: --relative-marks takes no parameter | Michael J Gruber | 2011-05-05 | 1 | -2/+2 |
| * | | | | | | | | | | | shell: add missing initialization of argv0_path | Dima Sharov | 2011-05-05 | 1 | -0/+2 |
| * | | | | | | | | | | | Git 1.7.5.1v1.7.5.1 | Junio C Hamano | 2011-05-04 | 3 | -2/+36 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |