summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* revert: Introduce --reset to remove sequencer stateRamkumar Ramachandra2011-08-048-20/+111
* revert: Make pick_commits functionally act on a commit listRamkumar Ramachandra2011-08-041-15/+28
* revert: Save command-line options for continuing operationRamkumar Ramachandra2011-08-042-2/+60
* revert: Save data for continuing after conflict resolutionRamkumar Ramachandra2011-08-042-4/+178
* revert: Don't create invalid replay_opts in parse_argsRamkumar Ramachandra2011-08-041-11/+27
* revert: Separate cmdline parsing from functional codeRamkumar Ramachandra2011-08-041-7/+7
* revert: Introduce struct to keep command-line optionsRamkumar Ramachandra2011-08-041-88/+113
* revert: Eliminate global "commit" variableRamkumar Ramachandra2011-08-041-11/+11
* revert: Rename no_replay to record_originRamkumar Ramachandra2011-08-041-4/+4
* revert: Don't check lone argument in get_encodingRamkumar Ramachandra2011-08-041-3/+0
* revert: Simplify and inline add_message_to_msgRamkumar Ramachandra2011-08-041-14/+14
* config: Introduce functions to write non-standard fileRamkumar Ramachandra2011-08-042-9/+29
* advice: Introduce error_resolve_conflictRamkumar Ramachandra2011-08-043-17/+26
* Merge branch 'mk/grep-pcre'Junio C Hamano2011-06-201-3/+3
|\
| * t7810: avoid unportable use of "echo"Junio C Hamano2011-06-201-3/+3
* | plug a few coverity-spotted leaksJim Meyering2011-06-204-5/+12
* | Merge branch 'di/no-no-existant'Junio C Hamano2011-06-197-14/+14
|\ \
| * | Fix typo: existant->existentDmitry Ivankov2011-06-167-14/+14
* | | Merge branch 'maint'Junio C Hamano2011-06-191-1/+1
|\ \ \
| * | | builtin/gc.c: add missing newline in messageAndreas Schwab2011-06-191-1/+1
* | | | tests: link shell libraries into valgrind directoryJeff King2011-06-171-2/+7
* | | | t/Makefile: pass test opts to valgrind target properlyJeff King2011-06-171-1/+1
* | | | Merge branch 'ab/i18n-scripts-basic'Junio C Hamano2011-06-171-1/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | sh-i18n--envsubst.c: do not #include getopt.hBrandon Casey2011-06-171-1/+0
* | | | Git 1.7.6-rc2v1.7.6-rc2Junio C Hamano2011-06-162-2/+2
* | | | gitweb: do not misparse nonnumeric content tag files that contain a digitJonathan Nieder2011-06-092-1/+9
* | | | Git 1.7.6-rc1v1.7.6-rc1Junio C Hamano2011-06-082-3/+11
* | | | Merge branch 'maint'Junio C Hamano2011-06-081-2/+4
|\ \ \ \ | | |/ / | |/| |
| * | | fetch: do not leak a refspecJim Meyering2011-06-081-2/+4
* | | | Merge branch 'jc/magic-pathspec'Junio C Hamano2011-06-071-6/+6
|\ \ \ \
| * | | | t3703: skip more tests using colons in file names on WindowsAlex Riesen2011-06-071-6/+6
* | | | | Merge branch 'jn/mime-type-with-params'Junio C Hamano2011-06-061-1/+1
|\ \ \ \ \
| * | | | | gitweb: Fix usability of $prevent_xssJakub Narebski2011-06-051-1/+1
* | | | | | Merge branch 'jn/gitweb-docs'Junio C Hamano2011-06-062-131/+135
|\ \ \ \ \ \
| * | | | | | gitweb: Move "Requirements" up in gitweb/INSTALLJakub Narebski2011-06-031-15/+15
| * | | | | | gitweb: Describe CSSMIN and JSMIN in gitweb/INSTALLJakub Narebski2011-06-021-6/+13
| * | | | | | gitweb: Move information about installation from README to INSTALLJakub Narebski2011-06-022-116/+113
* | | | | | | Merge branch 'jk/diff-not-so-quick'Junio C Hamano2011-06-065-5/+16
|\ \ \ \ \ \ \
| * | | | | | | diff: futureproof "stop feeding the backend early" logicJunio C Hamano2011-05-314-6/+11
| * | | | | | | diff_tree: disable QUICK optimization with diff filterJeff King2011-05-312-0/+6
* | | | | | | | Merge branch 'bc/maint-status-z-to-use-porcelain'Junio C Hamano2011-06-062-3/+11
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | builtin/commit.c: set status_format _after_ option parsingBrandon Casey2011-05-292-4/+5
| * | | | | | | t7508: demonstrate status's failure to use --porcelain format with -zBrandon Casey2011-05-291-0/+7
* | | | | | | | Sync with 1.7.5.4v1.7.6-rc0Junio C Hamano2011-06-012-1/+5
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Git 1.7.5.4v1.7.5.4Junio C Hamano2011-06-013-2/+6
| * | | | | | | Merge branch 'jk/maint-config-alias-fix' into maintJunio C Hamano2011-06-014-48/+30
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/fmt-req-fix' into maintJunio C Hamano2011-06-011-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/maint-docs' into maintJunio C Hamano2011-06-014-15/+35
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jn/doc-remote-helpers' into maintJunio C Hamano2011-06-011-3/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'kk/maint-prefix-in-config-mak' into maintJunio C Hamano2011-06-011-0/+1
| |\ \ \ \ \ \ \ \ \ \ \